From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Sep 2025 19:46:57 +0000 (-0700)
Subject: Merge tag 'x86_bugs_for_v6.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=d7ec0cf1cd79a74399b53453f9c48acbca7d6fce;p=linux-2.6-microblaze.git

Merge tag 'x86_bugs_for_v6.18_rc1' of git://git./linux/kernel/git/tip/tip

Pull x86 mitigation updates from Borislav Petkov:

 - Add VMSCAPE to the attack vector controls infrastructure

 - A bunch of the usual cleanups and fixlets, some of them resulting
   from fuzzing the different mitigation options

* tag 'x86_bugs_for_v6.18_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bugs: Report correct retbleed mitigation status
  x86/bugs: Fix reporting of LFENCE retpoline
  x86/bugs: Fix spectre_v2 forcing
  x86/bugs: Remove uses of cpu_mitigations_off()
  x86/bugs: Simplify SSB cmdline parsing
  x86/bugs: Use early_param() for spectre_v2
  x86/bugs: Use early_param() for spectre_v2_user
  x86/bugs: Add attack vector controls for VMSCAPE
  x86/its: Move ITS indirect branch thunks to .text..__x86.indirect_thunk
---

d7ec0cf1cd79a74399b53453f9c48acbca7d6fce