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. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpA9mMO8bIVY.pgp
Description: PGP signature
