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

Andrew Morton <[email protected]> Tue, 28 Jul 2026 13:47:55 -0700

Newsgroups	org.kernel.vger.linux-next,org.kernel.vger.linux-kernel
Message-ID	<[email protected]>

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

	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]


I'll email them at you...