Commit c4070e19 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge commit 'its-for-linus-20250509-merge' into x86/core, to resolve conflicts



 Conflicts:
	Documentation/admin-guide/hw-vuln/index.rst
	arch/x86/include/asm/cpufeatures.h
	arch/x86/kernel/alternative.c
	arch/x86/kernel/cpu/bugs.c
	arch/x86/kernel/cpu/common.c
	drivers/base/cpu.c
	include/linux/cpu.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 7d40efd6 6f5bf947
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment