Hi Jeremy, On Tue, 24 Apr 2012 15:01:46 -0700 Jeremy Fitzhardinge <jeremy@xxxxxxxx> wrote: > > Are you pulling from xen.git upstream/xen? I just updated it to be > current Linus master, so it shouldn't conflict any more. Yes, I fetch branch upstream/xen from git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git and, yes, it is empty now, thanks. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpaBfnKoG4Pn.pgp
Description: PGP signature
