linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	Alexei Starovoitov <ast@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jeff Vander Stoep <jeffv@google.com>,
	Jessica Yu <jeyu@kernel.org>, Kees Cook <keescook@chromium.org>,
	Luis Chamberlain <mcgrof@kernel.org>, NeilBrown <neilb@suse.com>,
	Stephen Kitt <steve@sk2.org>
Subject: Re: [PATCH v4 3/5] docs: admin-guide: document the kernel.modprobe sysctl
Date: Mon, 30 Mar 2020 11:48:12 -0700	[thread overview]
Message-ID: <20200330184812.GA108564@gmail.com> (raw)
In-Reply-To: <20200318230515.171692-4-ebiggers@kernel.org>

Andrew,

On Wed, Mar 18, 2020 at 04:05:13PM -0700, Eric Biggers wrote:
> From: Eric Biggers <ebiggers@google.com>
> 
> Document the kernel.modprobe sysctl in the same place that all the other
> kernel.* sysctls are documented.  Make sure to mention how to use this
> sysctl to completely disable module autoloading, and how this sysctl
> relates to CONFIG_STATIC_USERMODEHELPER.
> 
> Cc: Alexei Starovoitov <ast@kernel.org>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Jeff Vander Stoep <jeffv@google.com>
> Cc: Jessica Yu <jeyu@kernel.org>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Luis Chamberlain <mcgrof@kernel.org>
> Cc: NeilBrown <neilb@suse.com>
> Signed-off-by: Eric Biggers <ebiggers@google.com>
> ---
>  Documentation/admin-guide/sysctl/kernel.rst | 25 ++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)
> 

I just noticed there's already a patch going into 5.7 through the docs tree
(https://lkml.kernel.org/lkml/20200329172713.206afe79@lwn.net/) that creates the
documentation for this sysctl:

        commit 0317c5371e6a9b71a2e25b47013dd5c62d55d1a6
        Author: Stephen Kitt <steve@sk2.org>
        Date:   Tue Feb 18 13:59:17 2020 +0100

            docs: merge debugging-modules.txt into sysctl/kernel.rst

It looks for -mm, you resolved the conflict by changing my patch to add the
documentation to a different location in the file.  But that's not correct as it
results in this sysctl being documented twice.

Perhaps just drop this patch for now, but keep patches 1-2 and 4-5?  I can
rebase and resend this documentation patch later.

- Eric

  reply	other threads:[~2020-03-30 18:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-18 23:05 [PATCH v4 0/5] module autoloading fixes and cleanups Eric Biggers
2020-03-18 23:05 ` [PATCH v4 1/5] kmod: make request_module() return an error when autoloading is disabled Eric Biggers
2020-03-18 23:05 ` [PATCH v4 2/5] fs/filesystems.c: downgrade user-reachable WARN_ONCE() to pr_warn_once() Eric Biggers
2020-03-18 23:05 ` [PATCH v4 3/5] docs: admin-guide: document the kernel.modprobe sysctl Eric Biggers
2020-03-30 18:48   ` Eric Biggers [this message]
2020-03-18 23:05 ` [PATCH v4 4/5] selftests: kmod: fix handling test numbers above 9 Eric Biggers
2020-03-18 23:05 ` [PATCH v4 5/5] selftests: kmod: test disabling module autoloading Eric Biggers
2020-03-20  5:28 ` [PATCH v4 0/5] module autoloading fixes and cleanups Eric Biggers
2020-03-21  2:27   ` Andrew Morton
2020-03-23 17:12     ` Eric Biggers
2020-03-27 17:41       ` Eric Biggers

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200330184812.GA108564@gmail.com \
    --to=ebiggers@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=ast@kernel.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jeffv@google.com \
    --cc=jeyu@kernel.org \
    --cc=keescook@chromium.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mcgrof@kernel.org \
    --cc=neilb@suse.com \
    --cc=steve@sk2.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).