From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2022 17:17:19 +0000 (-0700)
Subject: Merge tag 'x86_kdump_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.0-rc1~205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60ee49fac817754a465a16b837347d1e9b7b090e;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'x86_kdump_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 kdump updates from Borislav Petkov:

 - Add the ability to pass early an RNG seed to the kernel from the boot
   loader

 - Add the ability to pass the IMA measurement of kernel and bootloader
   to the kexec-ed kernel

* tag 'x86_kdump_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/setup: Use rng seeds from setup_data
  x86/kexec: Carry forward IMA measurement log on kexec
---

60ee49fac817754a465a16b837347d1e9b7b090e
diff --cc arch/x86/Kconfig
index 17a16bcb174c9,670e0edc074f1..b2ec65522c589
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2010,6 -2032,8 +2010,7 @@@ config KEXE
  config KEXEC_FILE
  	bool "kexec file based system call"
  	select KEXEC_CORE
 -	select BUILD_BIN2C
+ 	select HAVE_IMA_KEXEC if IMA
  	depends on X86_64
  	depends on CRYPTO=y
  	depends on CRYPTO_SHA256=y