Re: linux-next: manual merge of the tip tree with the s390 tree

[Joel Granados]

On Wed, Mar 19, 2025 at 08:50:44PM +0100, Ingo Molnar wrote:
> 
> * Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> 
> > Hi all,
> > 
> > Today's linux-next merge of the tip tree got a conflict in:
> > 
> >   kernel/sysctl.c
> > 
> > between commit:
> > 
> >   20de8f8d3178 ("s390: Move s390 sysctls into their own file under arch/s390")
> > 
> > from the s390 tree and commit:
> > 
> >   c305a4e98378 ("x86: Move sysctls into arch/x86")
> > 
> > from the tip 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
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> 
> Thank you Stephen!
Indeed. Thanks!!!

Just a quick comment on this conflict:
1. The conflict is caused because "acpi_video_flags" is after
   "spin_retry" in the kern_table array. The solution (Which I see in
   next-20250328) is to remove them both from kernel/sysctl.c

2. This is the exact reason why we are moving these out of
   kernel/sysctl.c. It is too easy to touch the same region even if they
   are from different architectures.

Best

-- 

Joel Granados