Hi Jeremy, On Sat, 15 Jan 2011 12:05:44 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > Today's linux-next merge of the xen tree got a conflict in > drivers/xen/Kconfig, drivers/xen/gntdev.c and include/xen/gntdev.h > between various commits Linus' tree and various commits from the xen tree. > > As previously discussed, I have dropped the xen tree for today (as it > contains an older version of the changes that were merged into Linus' > tree). Just wondering if the xen tree is ever going to make a reappearance in linux-next? -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpYYQm8Iz_XK.pgp
Description: PGP signature
