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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20230116122841.67cbc7fc@canb.auug.org.au>
Date:   Mon, 16 Jan 2023 12:28:41 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     "Paul E. McKenney" <paulmck@...nel.org>,
        Tetsuo Handa <penguin-kernel@...ove.sakura.ne.jp>
Cc:     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

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).

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped