From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
"Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Stefan Hengelein <stefan.hengelein@fau.de>,
Andreas Ruprecht <rupran@einserver.de>,
Josh Triplett <josh@joshtriplett.org>
Subject: linux-next: manual merge of the akpm-current tree with the rcu tree
Date: Mon, 8 Sep 2014 18:53:36 +1000 [thread overview]
Message-ID: <20140908185336.4e5b6baf@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 564 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
init/Kconfig between commit d2cf0d24cb2d ("rcu: Fix attempt to avoid
unsolicited offloading of callbacks") from the rcu tree and commit
0c67534a7708 ("init/Kconfig: move RCU_NOCB_CPU dependencies to choice")
from the akpm-current tree.
I fixed it up (a version of the akpm-current tree commit also exists in
the rcu tree, so I used that) and can carry the fix as necessary (no
action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-09-08 8:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-08 8:53 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-12 5:04 linux-next: manual merge of the akpm-current tree with the rcu tree Stephen Rothwell
2021-05-12 14:04 ` Yury Norov
2020-05-19 16:12 Stephen Rothwell
2014-02-10 4:00 Stephen Rothwell
2014-02-10 5:24 ` 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=20140908185336.4e5b6baf@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=rupran@einserver.de \
--cc=stefan.hengelein@fau.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).