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

Message-ID: <20230111111439.4c4745d2@canb.auug.org.au>
Date:   Wed, 11 Jan 2023 11:14:39 +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: linux-next: manual merge of the rcu tree with the tomoyo tree

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.

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

Content of type "application/pgp-signature" skipped