linux-kernel - Re: linux-next: manual merge of the rcu tree with the tomoyo 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: <20230116043904.GQ2948950@paulmck-ThinkPad-P17-Gen-1>
Date:   Sun, 15 Jan 2023 20:39:04 -0800
From:   "Paul E. McKenney" <paulmck@...nel.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Tetsuo Handa <penguin-kernel@...ove.sakura.ne.jp>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Masahiro Yamada <masahiroy@...nel.org>
Subject: Re: linux-next: manual merge of the rcu tree with the tomoyo tree

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@...b.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