From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: xen/tip.git and how it should function?
Date: Wed, 31 Jul 2013 10:10:03 -0400
Message-ID: <20130731141003.GC23258@phenom.dumpdata.com>
References: <20130730175324.GA11003@phenom.dumpdata.com>
	<alpine.DEB.2.02.1307311222210.4893@kaball.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.02.1307311222210.4893@kaball.uk.xensource.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: boris.ostrovsky@oracle.com, xen-devel@lists.xensource.com, david.vrabel@citrix.com
List-Id: xen-devel@lists.xenproject.org

> > With two maintainers, this should be easy enough - each maintainer can put his or her
> > patches in their local tree (or some git tree). Create a 'stable/for-linus-3.12' and
> > do a git merge on his or her local tree, and push said 'stable/for-linus-3.12' up
> > to the tip tree.
> 
> It might be worth giving an heads up to each others, at least before
> pull requests to Linus.
> 


The other thing is that we could name them differently. Say:

	stable/for-linus-3.12.generic (for drivers/xen)
	stable/for-linux-3.12.x86     (arch/x86/xen...)
	stable/for-linux-3.12.arm

and then there are just three GIT PULLs during the merge window?