Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 12 Jan 2023 09:37:47 -0800
From:   "Paul E. McKenney" <paulmck@kernel.org>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Masahiro Yamada <masahiroy@kernel.org>
Subject: Re: linux-next: manual merge of the rcu tree with the tomoyo tree
Message-ID: <20230112173747.GO4028633@paulmck-ThinkPad-P17-Gen-1>
Reply-To: paulmck@kernel.org
References: <20230111111439.4c4745d2@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230111111439.4c4745d2@canb.auug.org.au>
Precedence: bulk

On Wed, Jan 11, 2023 at 11:14:39AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the rcu tree got a conflict in:
> 
>   security/tomoyo/Kconfig
> 
> between commit:
> 
>   80f8be7af03f ("tomoyo: Omit use of bin2c")
> 
> from the tomoyo tree and commit:
> 
>   ed87f6865857 ("tomoyo: Remove "select SRCU"")
> 
> 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.

I have it noted down, thank you!

							Thanx, Paul

> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc security/tomoyo/Kconfig
> index 772d2ab58fd1,a9796b400312..000000000000
> --- a/security/tomoyo/Kconfig
> +++ b/security/tomoyo/Kconfig
> @@@ -6,7 -6,7 +6,6 @@@ config SECURITY_TOMOY
>   	select SECURITYFS
>   	select SECURITY_PATH
>   	select SECURITY_NETWORK
> - 	select SRCU
>  -	select BUILD_BIN2C
>   	default n
>   	help
>   	  This selects TOMOYO Linux, pathname-based access control.