[Xen-devel] Re: linux-2.6-xen et al

[Chris Wright <chrisw@xxxxxxxxxxxx>]

* Aron Griffis (aron@xxxxxx) wrote:
> Could somebody explain the purpose, maintainership, etc of the
> following trees?
> 
> http://xenbits.xensource.com/linux-2.6-xen.hg

Purpose: Normal Linux source tree view of linux-2.6-sparse.

Maintainer: XenSource (primarily Christian is handling this)

> http://xenbits.xensource.com/ext/linux-2.6.rc-xen.hg

Purpose: Same as linux-2.6-xen.hg, but tracking ahead to -rc's

Maintainer: same as above, although it's lagged a bit, probably due to
redundancy of below.

> http://xenbits.xensource.com/ext/linux-2.6.tip-xen.hg

Purpose: Same as linux-2.6.rc-xen.hg, but tracking ahead to -tip of linux.

Maintainer: me, although I've lagged back to only tracking -rc's.

Basically, linux-2.6-xen is just effectively application of linux-sparse
tree, and the others are the same plus are tracking closer to Linus' tree.

> I've been pursuing inclusion of xen-ia64 in fedora rawhide, and in the
> process learned that Juan uses these trees to generate the patch for
> fedora's kernel rpm.  

Juan's tree is quite close to linux-2.6.tip-xen.hg (of course with
addition of fedora merges).

> This seems like a great approach (easier than using xen-unstable's
> sparse tree) but before following Juan down this path, I'd like to
> understand the intended purpose of these trees, who maintains them,
> and ideally the mechanics of that maintenance.  For example,
> linux-2.6-xen.hg seems to pull patches from xen-unstable, but it can't
> be a direct pull because one is a xen tree, the other is a kernel
> tree, so how is it done?

Going from xen-unstable to linux-2.6-xen is largely scripted (although
it needs human attention).  The rest of the merging is automated to the
degree that SCM's can help, final bit of conflict resolution being
manual, of course.

thanks,
-chris

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel