[GIT PULL] x86/bugs for v7.4-rc1

From: Borislav Petkov

Date: Mon Oct 19 2026 - 21:14:04 EST


Hi Linus,

please pull the x86 spec bugs lineup for v7.4-rc1.

Thx.

---

The following changes since commit cee9395acd8043be0644b25c34bfa86623f2b935:

Linux 7.3-rc1 (2026-08-30 13:34:40 -0700)

are available in the Git repository at:

ssh://git@xxxxxxxxxxxxxxxxxxx/pub/scm/linux/kernel/git/tip/tip.git tags/x86_bugs_for_v7.4_rc1

for you to fetch changes up to 1847c80537891baead3975f3ca969233ff7b2a11:

x86/bugs: Fix CONFIG_MITIGATION_RETPOLINE=n mitigation reporting (2026-10-02 15:48:29 -0700)

----------------------------------------------------------------
- AMD Zen6's BTB has per-context tagging so there's no need for the expensive
SRSO SafeRET mitigation anymore; add glue to detect and handle that

- Fix Spectre v2 mitigation reporting for RETPOLINE=n builds

----------------------------------------------------------------
Borislav Petkov (AMD) (1):
x86/bugs: Adapt SRSO mitigation to Zen6

Kim Phillips (1):
x86/bugs: Fix CONFIG_MITIGATION_RETPOLINE=n mitigation reporting

arch/x86/include/asm/cpufeatures.h | 1 +
arch/x86/kernel/cpu/bugs.c | 20 +++++++++++++++++---
arch/x86/kernel/cpu/scattered.c | 1 +
3 files changed, 19 insertions(+), 3 deletions(-)


--
Regards/Gruss,
Boris.

https://people.kernel.org/tglx/notes-about-netiquette