From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@kernel•org>,
Tetsuo Handa <penguin-kernel@i-love•sakura.ne.jp>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Masahiro Yamada <masahiroy@kernel•org>
Subject: linux-next: manual merge of the rcu tree with the tomoyo tree
Date: Wed, 11 Jan 2023 11:14:39 +1100 [thread overview]
Message-ID: <20230111111439.4c4745d2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-01-11 0:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 0:14 Stephen Rothwell [this message]
2023-01-12 17:37 ` linux-next: manual merge of the rcu tree with the tomoyo tree Paul E. McKenney
2023-01-16 1:28 ` Stephen Rothwell
2023-01-16 4:39 ` Paul E. McKenney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230111111439.4c4745d2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
--cc=paulmck@kernel$(echo .)org \
--cc=penguin-kernel@i-love$(echo .)sakura.ne.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox