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

On Tue, Aug 04, 2026 at 01:14:07PM -0700, Andrew Morton wrote:
> On Tue, 4 Aug 2026 09:54:04 +0200 Joel Granados <[email protected]> wrote:
> 
> > > > 
> > > > and
> > > > 
> > > > 	sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL
> > > > 	https://lore.kernel.org/[email protected]
> > > 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/[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.

Best

Joel

-----BEGIN PGP SIGNATURE-----

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmpy7vkACgkQupfNUreW
QU8iBAwAjF/wKdE3yxEuoLr+ZR2svPMn0VWukufQC2ME3oEwv0ItjxE0fVyKoo41
bhs9UHiA/sgTN6qvf2hPHMg7XNKe4DClXvKx3Vhi/XSn2cOs0hHyeF5Sf2qxRnFf
3mKjGhSlY1/piu3/2VUFx66nIopE8CY80qdjcI7IRU+DF64s1gmv3ICzhN5JFmok
ol5xpmPc8L6w3ybAtIqOF0Rbzg4NTkSK7ts43QoJ16INAr0xuD+YEkVqxkcgC+sY
KEfwlEIxDlwGglHsAndImb5AALeY5yXeROhl4SJLEarHJF6lvQy1MOWolEzSkYlj
9p8pD8pVqPfPpaSv99vdFYcRN9jwDbOAqoXS2cGd5ciO1vvqvcSJZzu9pXTEm0VK
xF/BZ/n0DGrX6R7NEQqVKf/rRQcimzxGGjTTLL+TxARyArGVHQmYdfsYhFpSJz9o
FqMG6MiCByJI08zvuyZcPvrkYLbprmwm05d8r61DDOhWPziXR7KCSdFLHS2REoAL
2IFlnKA4
=gaMf
-----END PGP SIGNATURE-----