Re: linux-next: manual merge of the rcu tree with Linus' tree

[Paul E. McKenney]

On Fri, Jul 08, 2022 at 02:12:46PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   arch/loongarch/Kconfig
> 
> between commit:
> 
>   7fd6ef61a5d6 ("LoongArch: Drop these obsolete selects in Kconfig")
> 
> from Linus' tree and commit:
> 
>   24a9c54182b3 ("context_tracking: Split user tracking Kconfig")
> 
> from the rcu 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!  I have noted this for my pull request.

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/loongarch/Kconfig
> index 53a912befb62,130dc65f3c85..000000000000
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@@ -75,7 -76,8 +75,7 @@@ config LOONGARC
>   	select HAVE_ARCH_TRACEHOOK
>   	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
>   	select HAVE_ASM_MODVERSIONS
> - 	select HAVE_CONTEXT_TRACKING
> + 	select HAVE_CONTEXT_TRACKING_USER
>  -	select HAVE_COPY_THREAD_TLS
>   	select HAVE_DEBUG_STACKOVERFLOW
>   	select HAVE_DMA_CONTIGUOUS
>   	select HAVE_EXIT_THREAD