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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20220708152319.GS1790663@paulmck-ThinkPad-P17-Gen-1>
Date:   Fri, 8 Jul 2022 08:23:19 -0700
From:   "Paul E. McKenney" <paulmck@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Frederic Weisbecker <frederic@...nel.org>,
        Huacai Chen <chenhuacai@...nel.org>,
        Huacai Chen <chenhuacai@...ngson.cn>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lukas Bulwahn <lukas.bulwahn@...il.com>
Subject: Re: linux-next: manual merge of the rcu tree with Linus' tree

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