Messages in this thread | | | Date | Tue, 17 May 2011 21:12:34 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the xen tree with Linus tree |
| |
Hi Jeremy,
On Sat, 15 Jan 2011 12:05:44 +1100 Stephen Rothwell <sfr@canb.auug.org.au> 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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |