From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jul 2024 03:07:27 +0000 (-0700)
Subject: Merge tag 'x86_bugs_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: io_uring-6.11-20240722~102
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2439a5eaa753d22759fb4248e0f5e459503fffad;p=linux-2.6-block.git

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

Pull x86 cpu mitigation updates from Borislav Petkov:

 - Add a spectre_bhi=vmexit mitigation option aimed at cloud
   environments

 - Remove duplicated Spectre cmdline option documentation

 - Add separate macro definitions for syscall handlers which do not
   return in order to address objtool warnings

* tag 'x86_bugs_for_v6.11_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/bugs: Add 'spectre_bhi=vmexit' cmdline option
  x86/bugs: Remove duplicate Spectre cmdline option descriptions
  x86/syscall: Mark exit[_group] syscall handlers __noreturn
---

2439a5eaa753d22759fb4248e0f5e459503fffad