]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
Merge branch 'x86/microcode' into x86/core, to merge dependent commits
authorIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:52 +0000 (10:37 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 13 May 2025 08:37:52 +0000 (10:37 +0200)
commit69cb33e2f81a3265383f0c8bbd27c32b4a5a6bf3
treef7336003d40eb892afcf5e8ec1caeb251b7fd38b
parentec8f353f5262acff120a0dc83b714d899ee94b7f
parent4804f5ad5d63cf7ddad148132a3ecea11410dfa9
Merge branch 'x86/microcode' 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/cpufeatures.h
arch/x86/kernel/cpu/bugs.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/cpu/microcode/amd.c
arch/x86/kernel/cpu/microcode/core.c