From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 13 May 2025 08:37:01 +0000 (+0200)
Subject: Merge branch 'x86/cpu' into x86/core, to resolve conflicts
X-Git-Tag: v6.16-rc1~195^2~29
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fb8414e644b133a9c3250f408232af99da256a4;p=thirdparty%2Fkernel%2Fstable.git

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

2fb8414e644b133a9c3250f408232af99da256a4