Merge branch 'linus' into x86/urgent, to pick up dependent commits

Prepare to fix aspects of the new BHI code. Signed-off-by: Ingo Molnar <mingo@kernel.org>
2026-09-26 18:16:26 +00:00 · 2024-04-10 07:04:04 +02:00 · 2024-04-10 07:04:04 +02:00 · a40d2525ea
commit a40d2525ea
parent 5ce344beac 2c71fdf02a
33 changed files with 463 additions and 87 deletions
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
--- a/arch/x86/entry/syscall_32.c
+++ b/arch/x86/entry/syscall_32.c
--- a/arch/x86/entry/syscall_64.c
+++ b/arch/x86/entry/syscall_64.c
--- a/arch/x86/entry/syscall_x32.c
+++ b/arch/x86/entry/syscall_x32.c
--- a/arch/x86/include/asm/cpufeatures.h
+++ b/arch/x86/include/asm/cpufeatures.h
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
--- a/arch/x86/kernel/cpu/scattered.c
+++ b/arch/x86/kernel/cpu/scattered.c
--- a/arch/x86/kvm/reverse_cpuid.h
+++ b/arch/x86/kvm/reverse_cpuid.h
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c