]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge branch 'x86/fpu' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:29 +0000 (10:37 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:29 +0000 (10:37 +0200)
commitec8f353f5262acff120a0dc83b714d899ee94b7f
treea5eab4c8ced9b7ea467da00aa5166a8c59d813d0
parent2fb8414e644b133a9c3250f408232af99da256a4
parent32d5fa804dc9bd7cf6651a1378ba616d332e7444
Merge branch 'x86/fpu' 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/include/asm/processor.h
arch/x86/kernel/traps.c