To pick the changes from:f43b9876e8("x86/retbleed: Add fine grained Kconfig knobs")a149180fbc("x86: Add magic AMD return-thunk")15e67227c4("x86: Undo return-thunk damage")369ae6ffc4("x86/retpoline: Cleanup some #ifdefery")4ad3278df6x86/speculation: Disable RRSBA behavior26aae8ccbcx86/cpu/amd: Enumerate BTC_NO9756bba284x86/speculation: Fill RSB on vmexit for IBRS3ebc170068x86/bugs: Add retbleed=ibpb2dbb887e87x86/entry: Add kernel IBRS implementation6b80b59b35x86/bugs: Report AMD retbleed vulnerabilitya149180fbcx86: Add magic AMD return-thunk15e67227c4x86: Undo return-thunk damagea883d624aex86/cpufeatures: Move RETPOLINE flags to word 115180218615x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug This only causes these perf files to be rebuilt: CC /tmp/build/perf/bench/mem-memcpy-x86-64-asm.o CC /tmp/build/perf/bench/mem-memset-x86-64-asm.o And addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/include/asm/cpufeatures.h' differs from latest version at 'arch/x86/include/asm/cpufeatures.h' diff -u tools/arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/cpufeatures.h Warning: Kernel ABI header at 'tools/arch/x86/include/asm/disabled-features.h' differs from latest version at 'arch/x86/include/asm/disabled-features.h' diff -u tools/arch/x86/include/asm/disabled-features.h arch/x86/include/asm/disabled-features.h Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org Link: https://lore.kernel.org/lkml/YtQM40VmiLTkPND2@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
3.1 KiB
3.1 KiB