]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 27 Feb 2024 09:09:49 +0000 (10:09 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 27 Feb 2024 09:09:49 +0000 (10:09 +0100)
commit9b9c280b9af2aa851d83e7d0b79f36a3d869d745
treeb61cf8566669d9615234e87696a833ee487e2655
parent6be4ec29685c216ebec61d35f56c3808092498aa
parent8009479ee919b9a91674f48050ccbff64eafedaa
Merge branch 'x86/urgent' into x86/apic, to resolve conflicts

 Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/intel.c
arch/x86/xen/smp.c