Messages in this thread | | | Date | Mon, 30 Mar 2020 11:48:12 -0700 | From | Eric Biggers <> | Subject | Re: [PATCH v4 3/5] docs: admin-guide: document the kernel.modprobe sysctl |
| |
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
| |