Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1024491iob; Fri, 13 May 2022 20:04:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4iApWRPzFdolHRsrJX5RglU2FmL18PxfzTzNjM9EZum/t7guwWdAML0T2wlrCrDWQI7i0 X-Received: by 2002:a05:600c:3b9d:b0:394:70a0:12d2 with SMTP id n29-20020a05600c3b9d00b0039470a012d2mr17767985wms.64.1652497478846; Fri, 13 May 2022 20:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652497478; cv=none; d=google.com; s=arc-20160816; b=BqA6hiZcGOpBKQdahbff+QhdnTDGdvU+Ewy1OiIZi+QQuM5JSfFcCVYQKRYdugttsg OSL3dVtT7ro/mI2pQWGjOxVnoTJw1p7KZwskxjFZEmxSNeAvhhIUoe82r+5HexmJAh/H WPMEjl5D2vtXFw0saYE8RvUtmnwGF+b9Ib/sSFqt6KsJxBs2MYbgJlGOeBlMthVZct9f xthwJ0g/fqdpFpTZ6USDLMmbYGijFZH5/w6yf2uYSwDS9l3nDArKZZ246pYbLyyQb6pL 5ZFWiCUVa8Aei48qndT/iCKT6mHs4kKXvakqq4ctF407YkHfSsm6FWSpRXsCyykYslLf KqeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=c2Rc5VpqkX82WaIoIA+gihkv0EYEJSgha/ojItAr5FI=; b=JmNgnvHFU2ouu2PKDAbtPBdyU7wu6x5B4Nk08A/jQh+anwF46cbBa9h4H3/8F9kywS Z5c21+z6ba9d8tMBNurht4UhAFskqNTwc+z/xzNqtfBtrgi5w7FK9lM1iSgd2R5CXErN fwlWvFF1EoZBBNy/nUZ9no69zbAQno1JVydiZbYyiUrLdqT6+wZNR23TU9aXY7FPsP3C vJpQnLxj3ok0NzorRHJctNHcNFt69CK7EGXy7N5cnbgiXpVFhS/VArun6/4Etyoqa7vk o0E2ejqV9IO0TwuEN7W64mmmI9WRVjhJxSj69wf0T/rvjIrpewSd61nnKBUbVYk5VbRC A3mQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=A6DEnqmQ; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="GT2tb/ep"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id 14-20020a056000156e00b00207a2224647si5543414wrz.182.2022.05.13.20.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 May 2022 20:04:38 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=A6DEnqmQ; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="GT2tb/ep"; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 45A1C3AEF7E; Fri, 13 May 2022 16:46:50 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233243AbiEMM4o (ORCPT + 99 others); Fri, 13 May 2022 08:56:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233058AbiEMM4m (ORCPT ); Fri, 13 May 2022 08:56:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A50A972A5; Fri, 13 May 2022 05:56:41 -0700 (PDT) Date: Fri, 13 May 2022 12:56:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1652446599; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c2Rc5VpqkX82WaIoIA+gihkv0EYEJSgha/ojItAr5FI=; b=A6DEnqmQo5vBHWB9Xq4g/DR9HlDy1t1ZdZaT1TSTgF5HlS0qL3g5E3/kMxY8M/3w6D6sy9 z2+0FycNqvD8d5kiuHxOIk4t87YKAWEDtqbM1rUesXoezGGTbZ3tC47rY5/Pea0UVxedj4 VUUnXstbqqAHNVyFyQ5okvQwiSldz8tZagPORrKIMMkv5cLJJ1W4lWwTFpG75/Y7FlaFDS 9XexZa9djMcO3ruHXTHChdrRqpRelXV6Mneohzij2AftIRLyJ8MePe9Iw3uWcQIWNMCTg+ qhFIhTYpLWrlMFdryQ5kYNb30jiJulk8sEBg1P273mDI27Xb9TOxjjy+E+7wwQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1652446599; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c2Rc5VpqkX82WaIoIA+gihkv0EYEJSgha/ojItAr5FI=; b=GT2tb/epI/l5X0QUZuiNDh/UNXtofoPisl6/QJOkO2dt5BvwyFGyYwJuqgeQsWHKGIYFeR BKdY27UXiMlCU7Bw== From: "tip-bot2 for Xiao Yang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/cleanups] x86/speculation: Add missing srbds=off to the mitigations= help text Cc: Xiao Yang , Borislav Petkov , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220513101637.216487-1-yangx.jy@fujitsu.com> References: <20220513101637.216487-1-yangx.jy@fujitsu.com> MIME-Version: 1.0 Message-ID: <165244659875.4207.17281650412201582456.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 AuthorDate: Fri, 13 May 2022 18:16:37 +08:00 Committer: Borislav Petkov 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 Signed-off-by: Borislav Petkov 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]