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

From: Andrew Morton

Date: Tue Aug 04 2026 - 16:18:39 EST


On Tue, 4 Aug 2026 09:54:04 +0200 Joel Granados <joel.granados@xxxxxxxxxx> wrote:

> > >
> > > and
> > >
> > > sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
> > > https://lore.kernel.org/amdveg1m4E4uQlGv@xxxxxxxxxx
> > I see that this one is already in next-20260803. probably went in
> > through mm tree.
> >
> > 23a24c8a95c5 sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL [Oleg Nesterov]
>
> To avoid further conflicts in next I can also take this one into
> sysctl-next and handle every thing in my PR to Linus.
>
> Let me know what you decide.

How about I remove

sysctl: move the "cad_pid" entry from pid_table[] to kern_reboot_table[]
https://lore.kernel.org/al4C572uhLdBvyzH@xxxxxxxxxx

and

sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
https://lore.kernel.org/amdveg1m4E4uQlGv@xxxxxxxxxx

from mm.git then forget all about them ;)