From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Aug 2022 22:21:18 +0000 (-0700)
Subject: Merge tag 'integrity-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar... 
X-Git-Tag: v6.6.17~6942
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=043402495deb5ccc3b3479dc69a03f990c41ea8d;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'integrity-v6.0' of git://git./linux/kernel/git/zohar/linux-integrity

Pull integrity updates from Mimi Zohar:
 "Aside from the one EVM cleanup patch, all the other changes are kexec
  related.

  On different architectures different keyrings are used to verify the
  kexec'ed kernel image signature. Here are a number of preparatory
  cleanup patches and the patches themselves for making the keyrings -
  builtin_trusted_keyring, .machine, .secondary_trusted_keyring, and
  .platform - consistent across the different architectures"

* tag 'integrity-v6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification
  arm64: kexec_file: use more system keyrings to verify kernel image signature
  kexec, KEYS: make the code in bzImage64_verify_sig generic
  kexec: clean up arch_kexec_kernel_verify_sig
  kexec: drop weak attribute from functions
  kexec_file: drop weak attribute from functions
  evm: Use IS_ENABLED to initialize .enabled
---

043402495deb5ccc3b3479dc69a03f990c41ea8d
diff --cc arch/x86/kernel/kexec-bzimage64.c
index b9bdb40,f299b48..6b58610
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@@ -17,8 -17,6 +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>