xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: boris.ostrovsky@oracle.com, xen-devel@lists.xensource.com,
	david.vrabel@citrix.com
Subject: Re: xen/tip.git and how it should function?
Date: Wed, 31 Jul 2013 10:10:03 -0400	[thread overview]
Message-ID: <20130731141003.GC23258@phenom.dumpdata.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1307311222210.4893@kaball.uk.xensource.com>

> > 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?

  parent reply	other threads:[~2013-07-31 14:10 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-30 17:53 xen/tip.git and how it should function? Konrad Rzeszutek Wilk
2013-07-31 11:25 ` Stefano Stabellini
2013-07-31 14:02   ` Konrad Rzeszutek Wilk
2013-07-31 14:10   ` Konrad Rzeszutek Wilk [this message]
2013-07-31 15:48     ` Stefano Stabellini
2013-07-31 15:57       ` Boris Ostrovsky
2013-07-31 16:11       ` David Vrabel
2013-07-31 16:22         ` Stefano Stabellini
2013-07-31 17:15           ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130731141003.GC23258@phenom.dumpdata.com \
    --to=konrad.wilk@oracle.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=david.vrabel@citrix.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).