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

On Tue, Aug 04, 2026 at 09:36:38AM +0200, Joel Granados wrote:
> On Tue, Jul 28, 2026 at 01:47:55PM -0700, Andrew Morton wrote:
> > On Tue, 28 Jul 2026 18:39:51 +0100 Mark Brown <[email protected]> wrote:
> > 
> > > Today's linux-next merge of the sysctl tree got a conflict in:
> > > 
> > >   kernel/time/jiffies.c
> > > 
> > > between commit:
> > > 
> > >   842912dea6d51 ("sysctl: remove CONFIG_PROC_SYSCTL, it just mirrors CONFIG_SYSCTL")
> > > 
> > > from the mm-nonmm-unstable tree and commit:
> > > 
> > >   a3c70a5a9f944 ("sysctl: Generate do_proc_doulongvec_minmax with do_proc_dotypevec macro")
> > > 
> > > from the sysctl tree.
> > 
> > Luis, can you please grab both
> I can put these into sysctl next if needed. Do you still need both of
> them to be there?
> 
> > 
> > 	sysctl: move the "cad_pid" entry from pid_table[] to kern_reboot_table[]
> > 	https://lore.kernel.org/[email protected]
> I do **not** see this one in next-20260803. I'll just add this to the
> sysctl-next.

This one might cause another conflict in linux next. To solve it just
replace CONFIG_PROC_SYSCTL with CONFIG_SYSCTL.

> 
> > 
> > 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.

Best

-- 

Joel Granados

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

iQGzBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmpxmpwACgkQupfNUreW
QU+zVwv+JPXu4te3+470yr1dGjccS+D9sdqsjYSQxRb2SfE8e1TrTpnDQBAGBgHg
JRrurCBWTWMuOEbwM8lpJP9sf2rNPGGmC3sQDkn9GXLuCj6GfPUrJImhsbPfBIym
AssumjBOeDw8V3jwEoEEgSaz/YVlvxwZN8seCf7aBtvor8GluurmpQhDbTUf0KQV
nUqNc4mLYbsLAJQV9zn9+mPf0p/0BMvWAqCK2AH8n4NFB2Ce3EjKM2dmeBrQnspi
ckwOd8x6UpTdElH7AdQpy576kPvXWfLHq7QBa8dAFy9TLdIi2KS91jmFzWUcLF2e
/MRzgBrrEr+iP/xcJmePxeVNSEtxWEPnEvlVmDj7G4njjf1FOO0DUAPQ6aeFjyUr
q5nnLoDQBc+FjtLluJAVRfqwK7MvSoWIZ2lGWp3nu2d6B8aoPgXSIyHWN0kq6a97
x+Tt1cVjMYqRHYtbhwS0wFrpgN2hQD7zAmlfhJRUMNrOR8UViAfMiCWxT9O9XH5z
dOPpBxlo
=8as0
-----END PGP SIGNATURE-----