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

From: Stephen Rothwell <[email-masked]>
Date: Wed, 26 Mar 2025 12:28:09 +1100

Hi all,

On Wed, 19 Mar 2025 15:54:10 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> 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.
> 
> diff --cc kernel/sysctl.c
> index 6c70fb3b2376,4ebe6136b08d..000000000000
> --- a/kernel/sysctl.c
> +++ b/kernel/sysctl.c
> @@@ -1888,15 -1843,15 +1834,6 @@@ static const struct ctl_table kern_tabl
>   		.proc_handler	= proc_dointvec,
>   	},
>   #endif
> - #if	defined(CONFIG_ACPI_SLEEP) && defined(CONFIG_X86)
>  -#if defined(CONFIG_S390) && defined(CONFIG_SMP)
> --	{
> - 		.procname	= "acpi_video_flags",
> - 		.data		= &acpi_realmode_flags,
> - 		.maxlen		= sizeof (unsigned long),
>  -		.procname	= "spin_retry",
>  -		.data		= &spin_retry,
>  -		.maxlen		= sizeof (int),
> --		.mode		= 0644,
> - 		.proc_handler	= proc_doulongvec_minmax,
>  -		.proc_handler	= proc_dointvec,
> --	},
> --#endif
>   #ifdef CONFIG_SYSCTL_ARCH_UNALIGN_NO_WARN
>   	{
>   		.procname	= "ignore-unaligned-usertrap",

This is now a conflict between the s390 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell