git.ipfire.org Git - thirdparty/kernel/stable.git/commit

]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit

projects / thirdparty / kernel / stable.git / commit

author	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:32:24 +0000 (10:32 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 13 May 2025 08:33:41 +0000 (10:33 +0200)
commit	11d8f542d9137027440001b075da60a59c7871cb
tree	1a89748cbaf7b47abff5255d1fdac97ad21385bf	tree
parent	82f2b0b97b36ee3fcddf0f0780a9a0825d52fec3	commit \| diff
parent	7f9958230d8a79d474829bee25ec9426397335ce	commit \| diff

Merge branch 'x86/alternatives' into x86/core, to merge dependent commits

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>

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history

Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git

RSS Atom

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/events/core.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi_64.c	diff1 \|	diff2 \|	blob \| history