From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 22 Apr 2025 06:31:41 +0000 (+0200)
Subject: Merge branch 'x86/cpu' into x86/microcode, to pick up dependent commits
X-Git-Tag: v6.16-rc1~195^2~27^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c96f564e6f943cf5d8536e1c43f243aa7c42b4ed;p=linux.git

Merge branch 'x86/cpu' into x86/microcode, to pick up dependent commits

Avoid a conflict in <asm/cpufeatures.h> by merging pending x86/cpu changes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

c96f564e6f943cf5d8536e1c43f243aa7c42b4ed