Re: [Xen-devel] Re: [Qemu-devel] [PATCH 00/10] xen: pv domain support.

[Gerd Hoffmann]

  Hi,

> The point was for Ian to be able to pull directly from qemu without
> getting any conflicts on those files.
> To be honest they are fairly similar now, so I am confident that git
> will be able to do its magic.

Ian can merge the changes from my repo first, then upstream qemu.  Maybe 
the later splitted into the first four patches (the stuff already in 
qemu-xen) and then the remaining bits (disk+nic backend & friends) which 
Ian wants to get via upstream qemu.  That should work out well.

cheers,
  Gerd