From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Paul E. McKenney" <paulmck@linux•vnet.ibm.com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Eric Dumazet <eric.dumazet@gmail•com>
Subject: linux-next: manual merge of the rcu tree with Linus' tree
Date: Wed, 6 Oct 2010 13:38:25 +1100 [thread overview]
Message-ID: <20101006133825.8ca341e4.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 556 bytes --]
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in
include/linux/rcupdate.h between commit
b3a084b9b684622b149e8dcf03855bf0d5fb588b ("rcu: rcu_read_lock_bh_held():
disabling irqs also disables bh") from Linus' tree and commit
ca5ecddfa8fcbd948c95530e7e817cee9fb43a3d ("rcu: define __rcu address
space modifier for sparse") from the rcu tree.
I am not sure how to fix this, so I just used the version from the rcu
tree.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next reply other threads:[~2010-10-06 2:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-06 2:38 Stephen Rothwell [this message]
2010-10-06 4:17 ` linux-next: manual merge of the rcu tree with Linus' tree Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2011-09-27 5:14 Stephen Rothwell
2011-09-27 13:14 ` Borislav Petkov
2011-09-27 6:04 Stephen Rothwell
2011-09-27 12:20 ` Frederic Weisbecker
2012-08-06 2:31 Stephen Rothwell
2012-11-29 3:06 Stephen Rothwell
2012-11-29 22:12 ` Paul E. McKenney
2016-03-30 0:23 Stephen Rothwell
2016-03-30 0:32 Stephen Rothwell
2016-03-30 10:30 ` Paul E. McKenney
2017-03-08 0:46 Stephen Rothwell
2017-03-08 0:56 ` Stephen Rothwell
2017-09-26 3:00 Stephen Rothwell
2017-09-26 3:26 ` Paul E. McKenney
2017-09-26 3:42 ` Stephen Rothwell
2018-05-14 3:46 Stephen Rothwell
2018-05-15 17:44 ` Paul E. McKenney
2018-06-12 0:46 Stephen Rothwell
2018-06-12 1:01 ` Paul E. McKenney
2018-06-18 3:48 ` Stephen Rothwell
2018-06-18 3:49 ` Stephen Rothwell
2018-06-18 14:48 ` Paul E. McKenney
2022-07-08 4:12 Stephen Rothwell
2022-07-08 15:23 ` Paul E. McKenney
2022-10-17 22:41 Stephen Rothwell
2022-10-18 18:38 ` 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=20101006133825.8ca341e4.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eric.dumazet@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=paulmck@linux$(echo .)vnet.ibm.com \
/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