From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 13 May 2025 08:37:52 +0000 (+0200)
Subject: Merge branch 'x86/microcode' into x86/core, to merge dependent commits
X-Git-Tag: v6.16-rc1~195^2~27
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=69cb33e2f81a3265383f0c8bbd27c32b4a5a6bf3;p=thirdparty%2Fkernel%2Flinux.git

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>
---

69cb33e2f81a3265383f0c8bbd27c32b4a5a6bf3
diff --cc arch/x86/kernel/cpu/microcode/amd.c
index 96cb992d50ef5,b2bbfc4ef3dcf..9c44b007c946f
--- a/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))