Messages in this thread | | | Date | Thu, 6 Apr 2017 12:31:58 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the pstore tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/firmware/efi/efi-pstore.c
between commit:
76cc9580e3fb ("pstore: Replace arguments for write() API")
from the pstore tree and commit:
fee929ba1c93 ("efi/pstore: Return error code (if any) from efi_pstore_write()")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
-- Cheers, Stephen Rothwell
diff --cc drivers/firmware/efi/efi-pstore.c index 93d8cdbe7ef4,6b5acefce6b3..000000000000 --- a/drivers/firmware/efi/efi-pstore.c +++ b/drivers/firmware/efi/efi-pstore.c @@@ -254,14 -274,14 +254,14 @@@ static int efi_pstore_write(struct psto for (i = 0; i < DUMP_NAME_LEN; i++) efi_name[i] = name[i]; - efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES, - !pstore_cannot_block_path(record->reason), - record->size, record->psi->buf); + ret = efivar_entry_set_safe(efi_name, vendor, PSTORE_EFI_ATTRIBUTES, - !pstore_cannot_block_path(reason), - size, psi->buf); ++ !pstore_cannot_block_path(record->reason), ++ record->size, record->psi->buf); - if (reason == KMSG_DUMP_OOPS) + if (record->reason == KMSG_DUMP_OOPS) efivar_run_worker(); - *id = part; + record->id = record->part; return ret; };
| |