Re: [Qemu-devel] [PATCH 13/13] xen: pv domain builder.

[Gerd Hoffmann]

>> If the patches break something, report it and I'll fix it up.
>> "I'm afraid something might break" doesn't help us going forward.
> 
> What I meant is that if your changes are committed to qemu upstream, I
> will get an enormous pile of merge conflicts when I try to merge from
> upstream into our tree.

What do you think about the merge plan outlined in
http://lists.xensource.com/archives/html/xen-devel/2008-08/msg00887.html
That should avoid the enormous pile of merge conflicts, right?

cheers,
  Gerd