From: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Date: Thu, 28 Jul 2022 04:39:07 +0000
Subject: docs/kernel-parameters: Update descriptions for "mitigations=" param
 with retbleed
Git-commit: ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f
Patch-mainline: 5.19
References: bsc#1199657 CVE-2022-29900 CVE-2022-29901 bsc#1203271 bsc#1206032

Updates descriptions for "mitigations=off" and "mitigations=auto,nosmt"
with the respective retbleed= settings.

Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: corbet@lwn.net
Link: https://lore.kernel.org/r/20220728043907.165688-1-eiichi.tsukata@nutanix.com
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
 Documentation/admin-guide/kernel-parameters.txt |    2 ++
 1 file changed, 2 insertions(+)

--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2482,6 +2482,7 @@
 					       mds=off [X86]
 					       tsx_async_abort=off [X86]
 					       mmio_stale_data=off [X86]
+					       retbleed=off [X86]
 
 			auto (default)
 				Mitigate all CPU vulnerabilities, but leave SMT
@@ -2499,6 +2500,7 @@
 					       mds=full,nosmt [X86]
 					       tsx_async_abort=full,nosmt [X86]
 					       mmio_stale_data=full,nosmt [X86]
+					       retbleed=auto,nosmt [X86]
 
 	mminit_loglevel=
 			[KNL] When CONFIG_DEBUG_MEMORY_INIT is set, this