All of lore.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot2 for Eiichi Tsukata" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Eiichi Tsukata <eiichi.tsukata@nutanix.com>,
	Borislav Petkov <bp@suse.de>,
	corbet@lwn.net, x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] docs/kernel-parameters: Update descriptions for "mitigations=" param with retbleed
Date: Fri, 29 Jul 2022 18:52:24 -0000	[thread overview]
Message-ID: <165912074412.15455.16713302879881825177.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20220728043907.165688-1-eiichi.tsukata@nutanix.com>

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

Commit-ID:     ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f
Gitweb:        https://git.kernel.org/tip/ea304a8b89fd0d6cf94ee30cb139dc23d9f1a62f
Author:        Eiichi Tsukata <eiichi.tsukata@nutanix.com>
AuthorDate:    Thu, 28 Jul 2022 04:39:07 
Committer:     Borislav Petkov <bp@suse.de>
CommitterDate: Fri, 29 Jul 2022 20:47:07 +02:00

docs/kernel-parameters: Update descriptions for "mitigations=" param with retbleed

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
---
 Documentation/admin-guide/kernel-parameters.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index c0fdb04..cc3ea8f 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3176,6 +3176,7 @@
 					       no_entry_flush [PPC]
 					       no_uaccess_flush [PPC]
 					       mmio_stale_data=off [X86]
+					       retbleed=off [X86]
 
 				Exceptions:
 					       This does not have any effect on
@@ -3198,6 +3199,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

      reply	other threads:[~2022-07-29 18:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-28  4:39 [PATCH] docs/kernel-parameters: Update retbleed descriptions for "mitigations=" param Eiichi Tsukata
2022-07-29 18:52 ` tip-bot2 for Eiichi Tsukata [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=165912074412.15455.16713302879881825177.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@suse.de \
    --cc=corbet@lwn.net \
    --cc=eiichi.tsukata@nutanix.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.