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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <6ir4rtzbnnsl325hgo7xvdj6jcqd6yw3zgppjvmsvakpxiejhc@xkkuiquipkvc>
Date: Mon, 4 Aug 2025 09:53:02 +0200
From: Joel Granados <joel.granados@...nel.org>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Andrew Morton <akpm@...ux-foundation.org>, 
	Luis Chamberlain <mcgrof@...nel.org>, Kees Cook <kees@...nel.org>, 
	Feng Tang <feng.tang@...ux.alibaba.com>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the sysctl tree with the
 mm-nonmm-unstable tree

On Thu, Jul 31, 2025 at 11:05:21AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> On Tue, 8 Jul 2025 19:00:03 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the sysctl tree got a conflict in:
> > 
> >   kernel/panic.c
...
> >   static const struct ctl_table kern_panic_table[] = {
> >   #ifdef CONFIG_SMP
> >   	{
> > @@@ -134,13 -183,16 +183,23 @@@
> >   		.mode           = 0644,
> >   		.proc_handler   = proc_douintvec,
> >   	},
> >  +	{
> >  +		.procname	= "panic_sys_info",
> >  +		.data		= &panic_print,
> >  +		.maxlen         = sizeof(panic_print),
> >  +		.mode		= 0644,
> >  +		.proc_handler	= sysctl_sys_info_handler,
> >  +	},
> > + #if (defined(CONFIG_X86_32) || defined(CONFIG_PARISC)) && \
> > + 	defined(CONFIG_DEBUG_STACKOVERFLOW)
> > + 	{
> > + 		.procname	= "panic_on_stackoverflow",
> > + 		.data		= &sysctl_panic_on_stackoverflow,
> > + 		.maxlen		= sizeof(int),
> > + 		.mode		= 0644,
> > + 		.proc_handler	= proc_dointvec,
> > + 	},
> > + #endif
> >   };
> >   
> >   static __init int kernel_panic_sysctls_init(void)
> 
> This is now a conflict between the mm-nonmm-stable tree and Linus' tree.
Makes sense, as the sysctl PR was merged at the end of July. From the
point of view of sysctl, it should be handled in the same way as
expressed in this thread. Feel free to e-mail me if you need further
sysctl input on how to handle it.

Best

-- 

Joel Granados

Download attachment "signature.asc" of type "application/pgp-signature" (660 bytes)