Merge branch 'x86/alternatives' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:32:24 +0000 (10:32 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:33:41 +0000 (10:33 +0200)
Prepare to resolve conflicts with an upstream series of fixes that conflict
with pending x86 changes:

  6f5bf947bab0 Merge tag 'its-for-linus-20250509' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/Kconfig
arch/x86/events/core.c
arch/x86/mm/tlb.c
arch/x86/platform/efi/efi_64.c

Simple merge
Simple merge
Simple merge
Simple merge