Subject: Re: linux-next: manual merge of the pidfd tree with the csky tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 5 Aug 2020 10:16:53 +1000

Hi all,

On Mon, 3 Aug 2020 18:25:50 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   arch/csky/Kconfig
> 
> between commits:
> 
>   e95a4f8cb985 ("csky: Add SECCOMP_FILTER supported")
>   953131e5b5a5 ("csky: Use top-down mmap layout")
>   bdcd93ef9afb ("csky: Add context tracking support")
> 
> from the csky tree and commit:
> 
>   140c8180eb7c ("arch: remove HAVE_COPY_THREAD_TLS")
> 
> from the pidfd 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/csky/Kconfig
> index af238739811e,902f1142d550..000000000000
> --- a/arch/csky/Kconfig
> +++ b/arch/csky/Kconfig
> @@@ -39,11 -38,6 +39,10 @@@ config CSK
>   	select GX6605S_TIMER if CPU_CK610
>   	select HAVE_ARCH_TRACEHOOK
>   	select HAVE_ARCH_AUDITSYSCALL
>  +	select HAVE_ARCH_MMAP_RND_BITS
>  +	select HAVE_ARCH_SECCOMP_FILTER
> - 	select HAVE_COPY_THREAD_TLS
>  +	select HAVE_CONTEXT_TRACKING
>  +	select HAVE_VIRT_CPU_ACCOUNTING_GEN
>   	select HAVE_DEBUG_BUGVERBOSE
>   	select HAVE_DYNAMIC_FTRACE
>   	select HAVE_DYNAMIC_FTRACE_WITH_REGS

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

-- 
Cheers,
Stephen Rothwell