From: Ingo Molnar Date: Wed, 16 Apr 2025 05:03:04 +0000 (+0200) Subject: Merge branch 'linus' into x86/cpu, to resolve conflicts X-Git-Tag: v6.16-rc1~195^2~27^2~4^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06e09002bc1d46505d6b3bd947ebaf3cec7acab8;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'linus' into x86/cpu, to resolve conflicts Conflicts: tools/arch/x86/include/asm/cpufeatures.h Signed-off-by: Ingo Molnar --- 06e09002bc1d46505d6b3bd947ebaf3cec7acab8 diff --cc tools/arch/x86/include/asm/cpufeatures.h index fdbc92aca812a,6c2c152d8a67b..bc81b9d1aeca5 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h @@@ -509,7 -519,7 +519,7 @@@ #define X86_BUG_ITLB_MULTIHIT X86_BUG(23) /* "itlb_multihit" CPU may incur MCE during certain page attribute changes */ #define X86_BUG_SRBDS X86_BUG(24) /* "srbds" CPU may leak RNG bits if not mitigated */ #define X86_BUG_MMIO_STALE_DATA X86_BUG(25) /* "mmio_stale_data" CPU is affected by Processor MMIO Stale Data vulnerabilities */ - /* unused, was #define X86_BUG_MMIO_UNKNOWN X86_BUG(26) * "mmio_unknown" CPU is too old and its MMIO Stale Data status is unknown */ -#define X86_BUG_MMIO_UNKNOWN X86_BUG(26) /* "mmio_unknown" CPU is too old and its MMIO Stale Data status is unknown */ ++/* unused, was #define X86_BUG_MMIO_UNKNOWN X86_BUG(26) "mmio_unknown" CPU is too old and its MMIO Stale Data status is unknown */ #define X86_BUG_RETBLEED X86_BUG(27) /* "retbleed" CPU is affected by RETBleed */ #define X86_BUG_EIBRS_PBRSB X86_BUG(28) /* "eibrs_pbrsb" EIBRS is vulnerable to Post Barrier RSB Predictions */ #define X86_BUG_SMT_RSB X86_BUG(29) /* "smt_rsb" CPU is vulnerable to Cross-Thread Return Address Predictions */