Messages in this thread | | | Date | Thu, 25 Aug 2011 14:24:50 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the xen tree with the tip tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |