Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp749551ybz; Wed, 15 Apr 2020 18:07:32 -0700 (PDT) X-Google-Smtp-Source: APiQypL2T/uZ6mINYoecoMjp7XUSdiv5Sn03CXFAU+Kmb8IKXacGbGYa3ENDxfqMKyo0hWHGsmpI X-Received: by 2002:a50:fe8f:: with SMTP id d15mr28699517edt.64.1586999252684; Wed, 15 Apr 2020 18:07:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586999252; cv=none; d=google.com; s=arc-20160816; b=jg7IIZDjpRxCwKwssogVpZDinYOMedb9in+6J7FdkEGEXEn/Wag9KQTvrE7K6mEJ+l eGFgZo6PPZ5H0m+72djIycOTe5uumyVRVLZDq+zenKrgGGqa1H2cWdJIRvMsT4i1a/FI BCC9+sJXI5XniOhRopzOsk0QQxSpVasK3/rmV5hq+iNPQ0djKVrrJzvsSns2q/p8onn/ FZN/9TIWtGg56DW7uh6UGYPOWxp4CiedMeihwSfbLhL1HtFb+YIkDFVpB7kks9xAzRol FS2kwrjkwyo89mKhbl32ZrGqD8aC+xh0ZIZIzffxkZfXmocGBIBDnLHuz8jHYWb26WdL M/WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :organization:references:in-reply-to:message-id:subject:cc:to:from :date; bh=aWzIAkiKphZ1UfCbr1f3REr0yI/HemNZF5T3L8swYNM=; b=ADUmTSG53aMaNbtjrGLcktHSoD0FwqkijYMtNgTQBcik4hSLcODb+G+LqlOxfudKzo kw/vF2VzhyBk7eVDbmlTvypG1sR1kQ5+75BQOs7a+A7SK5DBOzfvXvH9qTSeiDJa66LT S3HimUe21rzvHPJfUQ2zyuXPBuwTUZMI5QfMizSAibxgLHqN5YiKig9xoL2dlDsyt3bx CMRJ3wpVUpSzQ2epXISM0DBGKp3OVjd8E5/Qu5gwxvCQrt6o37tB8x1qLS8akjTmepQO BRmUMpCKp2zxpByJgCpYLURvRieQGjVXk+6J2dRATFPOge48uC7E/y+iOo3JQLz3Yu6z s+7g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h16si2120268edw.215.2020.04.15.18.07.09; Wed, 15 Apr 2020 18:07:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2442196AbgDOUul (ORCPT + 99 others); Wed, 15 Apr 2020 16:50:41 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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