Re: [Xen-devel] Re: [Qemu-devel] [PATCH 0/7] merge some xen bits into qemu

[Samuel Thibault]

Gerd Hoffmann, le Thu 07 Aug 2008 00:10:12 +0200, a écrit :
> Samuel Thibault wrote:
> > Gerd Hoffmann, le Wed 06 Aug 2008 17:35:39 +0200, a écrit :
> >>> AGAIN, THERE IS THE IAN JACKSON TREE.
> >>>
> >>> Thanks for reading.
> >> I get build failures when patching THE IAN JACKSON TREE due to THE IAN
> >> JACKSON TREE lagging behind upstream.
> > 
> > You didn't mention that. "lagging" a few months indeed, while merging
> > stuff.  And because xen 4.0 is about to be released, but it will
> > probably catch up soon.
> 
> Well, for 4.0.x you probably have to branch off anyway,

When 4.0 gets released, yes.

> so the release shouldn't stop catching up with upstream.

The way Xen has been working up to now is to branch the trunk just after
the release, not before.

> > Anyway that's not a reason for not using it, I
> > guess the build failures can be fixed more easily than redoing Ian's
> > work.
> 
> I'm using upstream qemu for development, and I'm not going to change that.

No problem.

> I can adapt the patches for the xen tree.

That's what I'm asking you from the start of the thread, I guess my
english is not so clear.

> Having the xen tree *not* lagging behind would be *very* helpful for
> keeping the trees and patches in sync.

Sure, it just happens that it couldn't be done before we get Ian's tree
working.  Once the 4.0 release is done we can tighten the gap.  And
things that shouldn't be only in Ian's tree (e.g. the enhanced serial
support) are being pushed already.

Samuel