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: Re: linux-next: manual merge of the rcu tree with the tomoyo tree
Date: Mon, 16 Jan 2023 12:28:41 +1100 [thread overview]
Message-ID: <20230116122841.67cbc7fc@canb.auug.org.au> (raw)
In-Reply-To: <20230111111439.4c4745d2@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi all,
On Wed, 11 Jan 2023 11:14:39 +1100 Stephen Rothwell <sfr@canb•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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-01-16 1:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-11 0:14 linux-next: manual merge of the rcu tree with the tomoyo tree Stephen Rothwell
2023-01-12 17:37 ` Paul E. McKenney
2023-01-16 1:28 ` Stephen Rothwell [this message]
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=20230116122841.67cbc7fc@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