From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: Re: master branch of xen.git Date: Tue, 10 Aug 2010 23:45:09 -0700 Message-ID: <4C6246F5.70309@goop.org> References: <4C626189020000780000F382@vpn.id2.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4C626189020000780000F382@vpn.id2.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Jan Beulich Cc: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org On 08/10/2010 11:38 PM, Jan Beulich wrote: > what's the disposition of the master branch of that tree? It doesn't > seem to have seen any update during the last couple of months, > and it's still 2.6.31-based. Shouldn't this be either what "stable" > is currently (i.e. 2.6.32-based) or match up with Linus' tree (or > the latest released version thereof)? I keep forgetting to update it. I think of it as a deprecated branch I'd like to get rid of, since the name is too vague. In principle the name could be better used for something like "bleeding edge head", but I think changing its meaning like that would be way too much trouble, so just dropping it after migrating everything away from it is probably the best thing to do. In the meantime, I'll make it the same as xen/stable-2.6.31.x, since that's more or less what it means. (Likewise, xen/stable is tracking xen/stable-2.6.32.x at the moment). I've also just started putting together a (pre-rc)2.6.36-based dom0 branch which will become the development focus soon (leaving 2.6.32 still supported but with backported changes, rather than the current flow of developing in .32 then forward-porting). J