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

[Joel Granados]

On Tue, Jul 28, 2026 at 06:39:51PM +0100, Mark Brown wrote:
> Hi all,
> 
> 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.
> 
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
I just checked next-20260803 and I see that all the sysctl changes are
maintained. So from my side all is well.

Best

-- 

Joel Granados

Attachment: signature.asc
Description: PGP signature