* linux-next: manual merge of the rcu tree with the ext4 tree
@ 2011-07-16 11:28 Stephen Rothwell
2011-07-18 22:39 ` Paul E. McKenney
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2011-07-16 11:28 UTC (permalink / raw)
To: Paul E. McKenney
Cc: linux-next, linux-kernel, Theodore Ts'o, Lai Jiangshan
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
Hi Paul,
Today's linux-next merge of the rcu tree got a conflict in
fs/jbd2/journal.c between commit 4862fd6047ed ("jbd2: remove
jbd2_dev_to_name() from jbd2 tracepoints") from the ext4 tree and commit
a5e245951e94 ("jbd2,rcu: Convert call_rcu(free_devcache) to kfree_rcu()")
from the rcu tree.
The former removes the function modified by the latter, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the rcu tree with the ext4 tree
2011-07-16 11:28 linux-next: manual merge of the rcu tree with the ext4 tree Stephen Rothwell
@ 2011-07-18 22:39 ` Paul E. McKenney
0 siblings, 0 replies; 2+ messages in thread
From: Paul E. McKenney @ 2011-07-18 22:39 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Theodore Ts'o, Lai Jiangshan
On Sat, Jul 16, 2011 at 09:28:38PM +1000, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the rcu tree got a conflict in
> fs/jbd2/journal.c between commit 4862fd6047ed ("jbd2: remove
> jbd2_dev_to_name() from jbd2 tracepoints") from the ext4 tree and commit
> a5e245951e94 ("jbd2,rcu: Convert call_rcu(free_devcache) to kfree_rcu()")
> from the rcu tree.
>
> The former removes the function modified by the latter, so I did that.
I now have removed that patch in -rcu as well.
Thanx, Paul
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-18 22:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-16 11:28 linux-next: manual merge of the rcu tree with the ext4 tree Stephen Rothwell
2011-07-18 22:39 ` Paul E. McKenney
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).