linux-next: manual merge of the tip tree with the efi-fixes tree

[Stephen Rothwell]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the tip tree got a conflict in:

  drivers/firmware/efi/libstub/x86-stub.c

between commit:

  db7724134c26 ("x86/boot: efistub: Assign global boot_params variable")

from the efi-fixes tree and commit:

  50dcc2e0d62e ("x86/boot: efistub: Assign global boot_params variable")

from the tip tree.

I fixed it up (I just arbitrarily chose the former) 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

Attachment: pgpgpLVguGqUB.pgp
Description: OpenPGP digital signature