Re: linux-next: manual merge of the rcu tree with the tip tree

From: Paul E. McKenney
Date: Mon Jun 20 2011 - 11:18:30 EST

On Mon, Jun 20, 2011 at 02:47:05PM +1000, Stephen Rothwell wrote:
> Hi Paul,
> Today's linux-next merge of the rcu tree got conflicts in
> kernel/rcutree.c and kernel/rcutree_plugin.h between various commits from
> the tip tree and various commits from the rcu tree.
> I can't easily resolve these, so I have dropped the rcu tree for today.

I will be resolving these shortly, please accept my apologies for the

Thanx, Paul
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at