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

[Joel Granados]

On Tue, Jul 28, 2026 at 01:47:55PM -0700, Andrew Morton wrote:
> On Tue, 28 Jul 2026 18:39:51 +0100 Mark Brown <broonie@xxxxxxxxxx> 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/al4C572uhLdBvyzH@xxxxxxxxxx
I do **not** see this one in next-20260803. I'll just add this to the
sysctl-next.

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

Let me know if you prefer some other solution.

Best

-- 

Joel Granados

Attachment: signature.asc
Description: PGP signature