linux-next: manual merge of the rcu tree with the tomoyo tree

[Stephen Rothwell]

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.

Attachment: pgpiOhRbomPUx.pgp
Description: OpenPGP digital signature