Message ID | 20230124193004.206841-20-ebiggers@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2337615wrn; Tue, 24 Jan 2023 11:37:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXuMBltigNyZGARzKUh0HIYbJouLaiiy7kP+fYrdxlt2xtHjTpGrYkzBkolyr0w0dnecPHtw X-Received: by 2002:a17:903:2292:b0:195:ea0e:3226 with SMTP id b18-20020a170903229200b00195ea0e3226mr20631324plh.31.1674589020376; Tue, 24 Jan 2023 11:37:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674589020; cv=none; d=google.com; s=arc-20160816; b=K7GlcFGaFeAbyb5PpxpUZJ2KJscWMTmAXfjucMK0eX6BN+WaNzVcEkrv86H+cWZcFD isWLNd02Ssjd+q0EcMFy9e8c1SClhUbLSzO8U5WiOhbSPqctWazJ1Nr1SLMK37IE/la3 34VyvP2gBhZBQeHUFuTa1sc4XNYx3a8LpHkrJAoz5MV55kY/RjZ4WT1AJ6xRHpeI/1YJ uoUdeQp/i9anK+WuA0E++i43CIqrlR9H21QY7wvOoEPbiObSOYJc8VoYO8iWTCRXxYZU 2kE5iNZP8+K9Ll/Dd8CHzzK+idi64wXFcgRsnutC8qQs7agbwcWnnzN0H4/fis5pxgLx vX6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dPFanE1lIcKEepsAUbmGII6ZIu97CogO7PEHfoCPYow=; b=Nft/B8c+5jFa3pb9bTCcvZnhNg9sptEIa3LrO3m9boe1KRMqKP+QSwPfgqAJG44hOZ 8DVq5w1Bju0OoegwMoUHBMRtoElt4mNzLGZV+SgVMhTmMAKg/rKibd87TZIOy/FcJZMc 9RMRRvnHDwSUwDTLo3lILDxLN5naQDBAxt1gE7LxdJ1hyl06xRBQAI4may8/f4HsANn4 YEhDwK0Us2UZhvYfjqU2Pv/H86utyE5DHhy1p/frUZYpISrPHeyUhPWeX9njyz1kzSPn HjTxAJtm+ogaTo4r9bHebbt4MbO7dQzUcgQyHXAZNVu46uQlBxSES2AeYNeKGuajucRn G8TQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mGlo48Fx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n19-20020a170902d0d300b00189c3cb41a6si3136617pln.93.2023.01.24.11.36.47; Tue, 24 Jan 2023 11:37:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=mGlo48Fx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233639AbjAXTg2 (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Tue, 24 Jan 2023 14:36:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234638AbjAXTfb (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 24 Jan 2023 14:35:31 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62DCC7D8D; Tue, 24 Jan 2023 11:35:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EF24261343; Tue, 24 Jan 2023 19:35:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1745FC433D2; Tue, 24 Jan 2023 19:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674588926; bh=jO10o07RAKyXXgWsy3XBxX0WTtST48LzT0RY2uOU2ZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mGlo48Fx3ML+funDHhl65ZQY9YsF8EJcjy2EnGZYycxunAG/Q4LfcfCEtfILh9eLL 8YQMvImcLM/gdAa8VmOaitmObhGngWEmTCJJFmo/wz/m916odX3w/S8ZU2WB8aaHNf frutuGr75XFjZycToqINNyVc1zdNxrhxyfgyiCSPb7MZi8y94FEGS+ERaLR4znIv41 t+XkcL+SUkoIqJIWHDpTPporDLubI94C+2UbQ2xwD1U0/FIG8vboz0yB+87ItHDY9s ltU5aDh34d2h9Wnac8nNNtM/mOetSmq+ecQQr4/maJMCDC18kn3+sL9VOy5YPnnf+j /o41p1v1Qhuiw== From: Eric Biggers <ebiggers@kernel.org> To: stable@vger.kernel.org, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Kees Cook <keescook@chromium.org>, SeongJae Park <sj@kernel.org>, Seth Jenkins <sethjenkins@google.com>, Jann Horn <jannh@google.com>, "Eric W . Biederman" <ebiederm@xmission.com>, linux-hardening@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot <lkp@intel.com> Subject: [PATCH 5.10 19/20] docs: Fix path paste-o for /sys/kernel/warn_count Date: Tue, 24 Jan 2023 11:30:03 -0800 Message-Id: <20230124193004.206841-20-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124193004.206841-1-ebiggers@kernel.org> References: <20230124193004.206841-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755933856828656817?= X-GMAIL-MSGID: =?utf-8?q?1755933856828656817?= |
Series |
Backport oops_limit to 5.10
|
|
Commit Message
Eric Biggers
Jan. 24, 2023, 7:30 p.m. UTC
From: Kees Cook <keescook@chromium.org> commit 00dd027f721e0458418f7750d8a5a664ed3e5994 upstream. Running "make htmldocs" shows that "/sys/kernel/oops_count" was duplicated. This should have been "warn_count": Warning: /sys/kernel/oops_count is defined 2 times: ./Documentation/ABI/testing/sysfs-kernel-warn_count:0 ./Documentation/ABI/testing/sysfs-kernel-oops_count:0 Fix the typo. Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/linux-doc/202212110529.A3Qav8aR-lkp@intel.com Fixes: 8b05aa263361 ("panic: Expose "warn_count" to sysfs") Cc: linux-hardening@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Eric Biggers <ebiggers@google.com> --- Documentation/ABI/testing/sysfs-kernel-warn_count | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/ABI/testing/sysfs-kernel-warn_count b/Documentation/ABI/testing/sysfs-kernel-warn_count index 08f083d2fd51b..90a029813717d 100644 --- a/Documentation/ABI/testing/sysfs-kernel-warn_count +++ b/Documentation/ABI/testing/sysfs-kernel-warn_count @@ -1,4 +1,4 @@ -What: /sys/kernel/oops_count +What: /sys/kernel/warn_count Date: November 2022 KernelVersion: 6.2.0 Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org>