Message ID | 20230124185110.143857-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 s9csp2319973wrn; Tue, 24 Jan 2023 10:56:18 -0800 (PST) X-Google-Smtp-Source: AMrXdXusSUo6X+zqrq0u97WGeaco3yV9WZ3FGOTYpf2YZSOvjTC/XvjvB3Kxx5aBk90M7up2UcCH X-Received: by 2002:a62:6302:0:b0:582:848c:6281 with SMTP id x2-20020a626302000000b00582848c6281mr27144099pfb.2.1674586577708; Tue, 24 Jan 2023 10:56:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674586577; cv=none; d=google.com; s=arc-20160816; b=rvYWeENtAUNcLFXnlnsiqhRf5rBu8EWWbZT058xu9eFEMAdj7QiTAuxf4I+6Pp3AEU zPx27Msu/tMkSKSCDMQF+X401vSprMrNlqJtPh54z7yxSeDzp1+mVV3tTo4wEPAHVPwJ RoHSF57qi9tUHNNmWZQ6ujF/rqWAhjpsRtyrLj8X5e2VxD+FFwG1uHXyFI9Q2mzodq5K pnR6GuyFiAyanM8iko5OuJtuv6/cEcT2GZ3tS4qLM1JKuwChRNNAb7QjwbQtbCF4ECNL cD8p74dQ57Hs1AOgEYSkHGxicO+nGBvzQMmtaiZ6NuIgSXDLKnSQO/iN40vS1yjkn2z6 /NsA== 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=cn1dEAFPoHgDlsBLgPdjK5+HxlH1GOlfFuYG06dNhfQq6PsbL7Nmi/LrI9EgAfl/PU pP1aPaznLb2VYiWL+kt5pRfncQZy+9rKREJ20Mf30kFtFNNoF/Qy8r03WFA97KgxYreF k4F6h/z7v/VvbdK5XLaLALP5tUh9OrwC7Mf51rwIdhnXlmQUOD+BcLIB7iCJjdh3i0P1 BqYxmFsKojWMIhcfJ0HbCt50wpV6Zo/kIXIfTfb5adBnBLBjxZpV0q08wns4uEX9INf8 KCF5ix8qqdoippPn8dKw1FGxJ8F+BAPvT62ZeOiNAwGzUvdmrF5i7psVTaSbR7OHZS+l 2HzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=iBXbf9Mb; 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 y63-20020a623242000000b0058a71b56a06si2896258pfy.130.2023.01.24.10.56.04; Tue, 24 Jan 2023 10:56:17 -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=iBXbf9Mb; 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 S234384AbjAXSx2 (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Tue, 24 Jan 2023 13:53:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234377AbjAXSwo (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 24 Jan 2023 13:52:44 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7CE84F860; Tue, 24 Jan 2023 10:52:15 -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 ams.source.kernel.org (Postfix) with ESMTPS id 7EB9EB816A9; Tue, 24 Jan 2023 18:52:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3B5DC433D2; Tue, 24 Jan 2023 18:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674586333; bh=jO10o07RAKyXXgWsy3XBxX0WTtST48LzT0RY2uOU2ZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iBXbf9MbqH9tK8NOgoe1sVzbOdV0d3hZqVyka7hvfhBzTZhP11a9R1rA5Qozm5Y0Y 0HzJ9iHUg3eU5ZOATzW54bex1ebvW6UoijwsE+FPriVqrOgUKdbGX59t8a757vho7Z tWyQHqQrRfdINqBYZXgQgbBwJKmrJwZceSrOLgetlZXW1vov0sxYRhBgfhMtIGeNkJ 9b8rH0dLOI1BFig7OtQxIaB0oVRBK4lG0IRu2V3QQ0Isgl6eHVsekkjjcF3D+yJtli lnsOxvAdn+ZZ9WmbevSUThYXj/CuT1dgMKveTeWu+2de+PN4MZWuzedBKtVSoUvtX4 xaJhnbnQmfc3w== 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.15 19/20] docs: Fix path paste-o for /sys/kernel/warn_count Date: Tue, 24 Jan 2023 10:51:09 -0800 Message-Id: <20230124185110.143857-20-ebiggers@kernel.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230124185110.143857-1-ebiggers@kernel.org> References: <20230124185110.143857-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?1755931295466388851?= X-GMAIL-MSGID: =?utf-8?q?1755931295466388851?= |
Series |
Backport oops_limit to 5.15
|
|
Commit Message
Eric Biggers
Jan. 24, 2023, 6:51 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>