linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] x86/speculation: Add missing srbds=off in the document of 'mitigations='
@ 2022-05-13 10:16 Xiao Yang
  2022-05-13 12:56 ` [tip: x86/cleanups] x86/speculation: Add missing srbds=off to the mitigations= help text tip-bot2 for Xiao Yang
  0 siblings, 1 reply; 2+ messages in thread
From: Xiao Yang @ 2022-05-13 10:16 UTC (permalink / raw)
  To: linux-kernel, linux-doc; +Cc: mgross, bp, tglx, Xiao Yang

Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
---
 Documentation/admin-guide/kernel-parameters.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3f1cc5e317ed..93e9b15f1cf4 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3103,6 +3103,7 @@
 					       mds=off [X86]
 					       tsx_async_abort=off [X86]
 					       kvm.nx_huge_pages=off [X86]
+					       srbds=off [X86,INTEL]
 					       no_entry_flush [PPC]
 					       no_uaccess_flush [PPC]
 
-- 
2.21.0




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [tip: x86/cleanups] x86/speculation: Add missing srbds=off to the mitigations= help text
  2022-05-13 10:16 [PATCH] x86/speculation: Add missing srbds=off in the document of 'mitigations=' Xiao Yang
@ 2022-05-13 12:56 ` tip-bot2 for Xiao Yang
  0 siblings, 0 replies; 2+ messages in thread
From: tip-bot2 for Xiao Yang @ 2022-05-13 12:56 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: Xiao Yang, Borislav Petkov, x86, linux-kernel

The following commit has been merged into the x86/cleanups branch of tip:

Commit-ID:     553b0cb30b5452198de3187f1a79989eba38df00
Gitweb:        https://git.kernel.org/tip/553b0cb30b5452198de3187f1a79989eba38df00
Author:        Xiao Yang <yangx.jy@fujitsu.com>
AuthorDate:    Fri, 13 May 2022 18:16:37 +08:00
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 13 May 2022 14:48:50 +02:00

x86/speculation: Add missing srbds=off to the mitigations= help text

The mitigations= cmdline option help text misses the srbds=off option.
Add it.

  [ bp: Add a commit message. ]

Signed-off-by: Xiao Yang <yangx.jy@fujitsu.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/r/20220513101637.216487-1-yangx.jy@fujitsu.com
---
 Documentation/admin-guide/kernel-parameters.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 3f1cc5e..93e9b15 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3103,6 +3103,7 @@
 					       mds=off [X86]
 					       tsx_async_abort=off [X86]
 					       kvm.nx_huge_pages=off [X86]
+					       srbds=off [X86,INTEL]
 					       no_entry_flush [PPC]
 					       no_uaccess_flush [PPC]
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-05-13 12:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-13 10:16 [PATCH] x86/speculation: Add missing srbds=off in the document of 'mitigations=' Xiao Yang
2022-05-13 12:56 ` [tip: x86/cleanups] x86/speculation: Add missing srbds=off to the mitigations= help text tip-bot2 for Xiao Yang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).