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@xxxxxxxxxxxxxxxx> 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
