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

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

Hi all,

On Wed, 22 Jul 2020 20:38:12 +1000 Stephen Rothwell <[email-masked]> wrote:
>
> Today's linux-next merge of the pidfd tree got a conflict in:
> 
>   arch/um/Kconfig
> 
> between commit:
> 
>   5c77ba8aa183 ("dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig")
> 
> from the sh 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.
> 
> diff --cc arch/um/Kconfig
> index 32c1d1945033,ef69be17ff70..000000000000
> --- a/arch/um/Kconfig
> +++ b/arch/um/Kconfig
> @@@ -14,8 -14,6 +14,7 @@@ config UM
>   	select HAVE_FUTEX_CMPXCHG if FUTEX
>   	select HAVE_DEBUG_KMEMLEAK
>   	select HAVE_DEBUG_BUGVERBOSE
> - 	select HAVE_COPY_THREAD_TLS
>  +	select NO_DMA
>   	select GENERIC_IRQ_SHOW
>   	select GENERIC_CPU_DEVICES
>   	select GENERIC_CLOCKEVENTS

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

-- 
Cheers,
Stephen Rothwell