From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5989EC2BA19 for ; Wed, 15 Apr 2020 20:50:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3B0C8206E9 for ; Wed, 15 Apr 2020 20:50:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442192AbgDOUuk (ORCPT ); Wed, 15 Apr 2020 16:50:40 -0400 Received: from ms.lwn.net ([45.79.88.28]:52672 "EHLO ms.lwn.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2442190AbgDOUui (ORCPT ); Wed, 15 Apr 2020 16:50:38 -0400 Received: from lwn.net (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ms.lwn.net (Postfix) with ESMTPSA id 8CB612D8; Wed, 15 Apr 2020 20:50:37 +0000 (UTC) Date: Wed, 15 Apr 2020 14:50:36 -0600 From: Jonathan Corbet To: Eric Biggers Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Kitt , Luis Chamberlain , NeilBrown , Jessica Yu , Andrew Morton Subject: Re: [PATCH] docs: admin-guide: merge sections for the kernel.modprobe sysctl Message-ID: <20200415145036.671e46f9@lwn.net> In-Reply-To: <20200414172430.230293-1-ebiggers@kernel.org> References: <20200414172430.230293-1-ebiggers@kernel.org> Organization: LWN.net MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Sender: linux-doc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-doc@vger.kernel.org On Tue, 14 Apr 2020 10:24:30 -0700 Eric Biggers wrote: > Documentation for the kernel.modprobe sysctl was added both by > commit 0317c5371e6a ("docs: merge debugging-modules.txt into > sysctl/kernel.rst") and by commit 6e7158250625 ("docs: admin-guide: > document the kernel.modprobe sysctl"), resulting in the same sysctl > being documented in two places. Merge these into one place. > > Signed-off-by: Eric Biggers > --- > > Jon, could you take this through the docs tree as a fix for 5.7? Applied, thanks. jon