Hi Linus,
please pull two x86/kdump updates for 6.0.
That branch will conflict a bit with the previous x86/build pull, the
resolution is simple though (courtesy of mingo):
Merge: 68b8e9713c8e 2d17bd24b016
Author: Ingo Molnar <[email protected]>
Date: Tue Jul 26 09:06:10 2022 +0200
Merge branch 'x86/build' into x86/kdump, to resolve conflict
The following commit in x86/build made the use of BUILD_BIN2C unnecessary:
2d17bd24b016 ("x86/purgatory: Omit use of bin2c")
Propagate this to x86/kdump as well, where the following commit
modified the same "config KEXEC_FILE" block:
b69a2afd5afc ("x86/kexec: Carry forward IMA measurement log on kexec")
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <[email protected]>
diff --cc arch/x86/Kconfig
index 670e0edc074f,901cb59d3a90..86969a880c77
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2032,8 -2032,6 +2032,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
Thx.
---
The following changes since commit 32346491ddf24599decca06190ebca03ff9de7f8:
Linux 5.19-rc6 (2022-07-10 14:40:51 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_kdump_for_v6.0_rc1
for you to fetch changes up to 68b8e9713c8ec90af93c16e1de51cca18cefdb56:
x86/setup: Use rng seeds from setup_data (2022-07-11 09:59:31 +0200)
----------------------------------------------------------------
- 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
----------------------------------------------------------------
Borislav Petkov (1):
Merge tag 'v5.19-rc6' into tip:x86/kdump
Jason A. Donenfeld (1):
x86/setup: Use rng seeds from setup_data
Jonathan McDowell (1):
x86/kexec: Carry forward IMA measurement log on kexec
arch/x86/Kconfig | 1 +
arch/x86/include/uapi/asm/bootparam.h | 15 +++++--
arch/x86/kernel/e820.c | 6 +--
arch/x86/kernel/kexec-bzimage64.c | 74 +++++++++++++++++++++++++++++++++--
arch/x86/kernel/setup.c | 73 ++++++++++++++++++++++++++++++++++
drivers/of/kexec.c | 13 +++---
include/linux/ima.h | 5 +++
include/linux/of.h | 2 -
security/integrity/ima/ima_kexec.c | 2 +-
9 files changed, 171 insertions(+), 20 deletions(-)
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Martje Boudien Moerman
(HRB 36809, AG Nürnberg)
The pull request you sent on Mon, 1 Aug 2022 17:27:50 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tags/x86_kdump_for_v6.0_rc1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/60ee49fac817754a465a16b837347d1e9b7b090e
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html