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:   Sun, 15 Jan 2023 20:39:04 -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: <20230116043904.GQ2948950@paulmck-ThinkPad-P17-Gen-1>
Reply-To: paulmck@kernel.org
References: <20230111111439.4c4745d2@canb.auug.org.au>
 <20230116122841.67cbc7fc@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230116122841.67cbc7fc@canb.auug.org.au>
Precedence: bulk

On Mon, Jan 16, 2023 at 12:28:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Wed, 11 Jan 2023 11:14:39 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > 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.
> 
> So the rcu tree commit is now duplicated in the tomoyo tree (but
> slightly different due to the bin2c commit).

I will be dropping it from -rcu on my next rebase, and apologies for
the hassle!

							Thanx, Paul