Hi all, Today's linux-next merge of the xen tree got a conflict in arch/x86/include/asm/spinlock.h between a series of commits from the tip tree and a smaller series of similar commits from the xen tree. I see that Linus is commenting on these patches at the moment, and its not easy to resolve the conflicts, so I will just use the xen tree from next-20110824 for today. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgp6uycmPxpd5.pgp
Description: PGP signature
