[Xen-devel] xen.git branches

[Jeremy Fitzhardinge <jeremy@xxxxxxxx>]

Another month, another branch shuffle to confuse everyone ;)

I've added a couple of new branches:

   * xen/stable-2.6.31.x - This is currently identical to xen/master. 
     As its name suggests, it is going to track the 2.6.31.x stable
     tree.  I don't think there'll be any more 2.6.31.x kernels
     released, so this will just have Xen-related bugfixes.  Required
     for pre-Xen 4/3.4.3.
   * xen/stable-2.6.32.x - This is currently an alias of xen/stable. 
     2.6.32 is going to be a long-term maintained kernel, so this
     branch will likely be active for a long time.  It will get both
     Linux updates and Xen bugfixes+features.  Requires Xen 4 or 3.4.3.

So what about the other branches?

   * xen/stable - will always be the most recent "stable" kernel.  For
     now it will track stable-2.6.32.x, but when we move the main
     development focus to 2.6.33 and beyond, it will track that stable
     kernel.  It will be the default branch for xen.git.
   * xen/master - I haven't quite worked out what to do with this in
     the medium term.  I'm thinking that I'll make xen/master an alias
     for xen/stable, since people are already using it as a default
     branch.  At the moment its still stable-2.6.31.x.
   * xen/next - Active development branch.  Generally bleeding-edge.


I'm not quite ready to move xen/next into bleeding-edge phase yet.  The 
2.6.32 tree is still missing a few things and needs more testing before 
I'm happy with it.
    J

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