Merge branch 'linus' into x86/cpu, to resolve conflicts

 Conflicts:
	tools/arch/x86/include/asm/cpufeatures.h

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/include/asm/nospec-branch.h
Simple merge

diff --cc arch/x86/kernel/cpu/bugs.c
Simple merge

diff --cc drivers/ras/amd/atl/internal.h
Simple merge

diff --cc tools/arch/x86/include/asm/cpufeatures.h
index fdbc92aca812a45a497ebbc17dccade8b0950c42,6c2c152d8a67b9bf5836d4fe4860476684f282ff..bc81b9d1aeca5c0cbe62ea3c48147238bacce74c
--- 1/tools/arch/x86/include/asm/cpufeatures.h
--- 2/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 */

diff --cc tools/perf/check-headers.sh
Simple merge