linux-next: manual merge of the tip tree with the integrity tree

[Stephen Rothwell]

Hi all,

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

  arch/x86/kernel/kexec-bzimage64.c

between commit:

  c903dae8941d ("kexec, KEYS: make the code in bzImage64_verify_sig generic")

from the integrity tree and commit:

  68b8e9713c8e ("x86/setup: Use rng seeds from setup_data")

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 arch/x86/kernel/kexec-bzimage64.c
index f299b48f9c9f,b9bdb40364a6..000000000000
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@@ -17,6 -17,8 +17,7 @@@
  #include <linux/kernel.h>
  #include <linux/mm.h>
  #include <linux/efi.h>
 -#include <linux/verification.h>
+ #include <linux/random.h>
  
  #include <asm/bootparam.h>
  #include <asm/setup.h>

Attachment: pgpZtfROt1jHf.pgp
Description: OpenPGP digital signature