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>

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/kernel/cpu/bugs.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/cpu/microcode/amd.c
index 96cb992d50ef55be6442044bb0a5551dfaeb44ea,b2bbfc4ef3dcf279fe46281ec554c789ddb646d6..9c44b007c946f8b62c83946b972e8d4f946ba2ec
--- 1/arch/x86/kernel/cpu/microcode/amd.c
--- 2/arch/x86/kernel/cpu/microcode/amd.c
+++ b/arch/x86/kernel/cpu/microcode/amd.c
@@@ -217,10 -211,10 +217,9 @@@ static bool verify_sha256_digest(u32 pa
  {
        struct patch_digest *pd = NULL;
        u8 digest[SHA256_DIGEST_SIZE];
-       struct sha256_state s;
        int i;
  
 -      if (x86_family(bsp_cpuid_1_eax) < 0x17 ||
 -          x86_family(bsp_cpuid_1_eax) > 0x19)
 +      if (x86_family(bsp_cpuid_1_eax) < 0x17)
                return true;
  
        if (!need_sha_check(cur_rev))

diff --cc arch/x86/kernel/cpu/microcode/core.c
Simple merge