Re: linux-next: manual merge of the sysctl tree with the mm-nonmm-unstable tree

Joel Granados <[email protected]> Fri, 7 Aug 2026 11:21:26 +0200

Newsgroups	org.kernel.vger.linux-next,org.kernel.vger.linux-kernel
Message-ID	<cyxygrqc6anzi7kdqd4shdg2ycvnlpu5z6j6tua466parti3ty@dwgitlwkshgr>

Hey Oleg

On Thu, Aug 06, 2026 at 08:04:28PM +0200, Oleg Nesterov wrote:
> Joel, et al,
> 
> First of all, sorry for the hassle caused by my patches ;)
No worries. I think removing one of those configs is the right thing to
do.

> 
> On 08/05, Joel Granados wrote:
> >
> > On Tue, Aug 04, 2026 at 01:14:07PM -0700, Andrew Morton wrote:
> > >
> > > How about I remove
> > >
> > > 	sysctl: move the "cad_pid" entry from pid_table[] to kern_reboot_table[]
> > > 	https://lore.kernel.org/[email protected]
> > >
> > > and
> > >
> > > 	sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
> > > 	https://lore.kernel.org/[email protected]
> > >
> > > from mm.git then forget all about them ;)
> >
> > Works for me. I had already picked up the first, I'll add the second to
> > sysctl-next and they will go upstream through the sysctl tree.
> 
> From [PATCH -mm v2 0/1] sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
> 
> 	If this patch is accepted, I'll send a couple of followup cleanups:
> 
> 		kernel/sysctl.c:
> 			collapse the now-identical CONFIG_SYSCTL nesting
> 
> 		drivers/parport/procfs.c, fs/dcache.c, and fs/file_table.c:
> 			drop the CONFIG_PROC_FS checks, now it is clear that
> 			CONFIG_SYSCTL depends on it
> 
> Now that I see both patches in
> https://git.kernel.org/pub/scm/linux/kernel/git/joel.granados/linux.git/log/?h=jag/sysctl
> let me ask..
Its already in sysctl-next https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git/log/?h=sysctl-next
which means it is in linux-next (have not checked).

> 
> Can I send these (minor) cleanups based on sysctl-next to you right now
> (before I forget it ;) ?

Send them now based on sysctl-next. My guess is that it is too late to
include them in this release. But they will get queued up for the next
one.

Best

Joel

signature.asc (application/pgp-signature, 659 B)