Merge branch 'x86/cpu' into x86/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:01 +0000 (10:37 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:01 +0000 (10:37 +0200)
commit2fb8414e644b133a9c3250f408232af99da256a4
tree62212fe1b6dec3949a47ac6d92f3070842ab9ae2
parent821f82125c47217390099532b09bd09cee9adaac
parentc1ab4ce3cb759f69fb9085a060e568b73e8f5cd8
Merge branch 'x86/cpu' into x86/core, to resolve conflicts

 Conflicts:
arch/x86/kernel/cpu/bugs.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
MAINTAINERS
arch/x86/include/asm/nospec-branch.h
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c