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

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

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

iQGyBAABCgAdFiEErkcJVyXmMSXOyyeQupfNUreWQU8FAmpxmGAACgkQupfNUreW
QU/QyQv3RnCmJaDzeP4/1B4GyoLI1I3BY8vdg9MNaqtyeRiZawRX9co/jL60vAlC
68pt1j5MSXWzjObT6lmrWdRWJR6t+QAvKk/34TZM0fyp56TpMMVRfWKUT7AI+6cC
aWwQjkwIOo/pbL81W9ZuadC8a02MiT91E124zXriKMa2pPk4W3ruo/6IOpjv7YSr
J2Ri3qQN57SRsay3DfBBNuvd2MSuTMg5YVqEj5KJaJyAtA9aX+3z00HvSfuPgtYp
zqyS/eKYutsffHyID1bmONpuKzOpVKF4EUeDbTkYek8b8kmuExdSU9iq3YA1P8nr
dd/MYZwgMMauBgtr+GOppN/Z4PZhCz87cXTOCdjYXm7eTjApv+R1kXlbmawUkcnk
pk8Xrz5SYTPdZpPRYzfDcML1RcbBN1yZnlDtvGDP3UiQs3L08rpCMXCAic9aBGk0
eD+bu4eKuj43aft3HvilprRSGk8k78GCdQNVfkpF5IAFgQj5rY80SvAcwM370xhs
XPlB9Ik=
=2yoa
-----END PGP SIGNATURE-----