linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Josh Boyer <jwboyer@linux.vnet.ibm.com>
To: Grant Likely <grant.likely@secretlab.ca>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Andrew Morton <akpm@linux-foundation.org>,
	linuxppc-dev list <linuxppc-dev@ozlabs.org>
Subject: Re: Updates to powerpc.git
Date: Wed, 09 Jul 2008 12:31:33 -0400	[thread overview]
Message-ID: <1215621093.32502.1.camel@weaponx> (raw)
In-Reply-To: <20080709162008.GC28130@secretlab.ca>

On Wed, 2008-07-09 at 10:20 -0600, Grant Likely wrote:
> On Thu, Jul 10, 2008 at 02:08:32AM +1000, Stephen Rothwell wrote:
> > Kumar,
> > 
> > On Wed, 9 Jul 2008 07:58:38 -0500 Kumar Gala <galak@kernel.crashing.org> wrote:
> > >
> > > What is your intent with the 'master' branch?  I hope you do NOT plan  
> > > on ever rebasing it.  I assume if a patch gets into master and we drop  
> > > it you'll do a git-revert of it?
> > 
> > "Ever" is such a strong word.  Even Paul on occasion rebased his master
> > branch.  I see no reason why Ben could not run his master (or maybe
> > better named "test") branch as a place that patches come and go and his
> > "next" branch as something that never (or very rarely) gets rebased with
> > commits progressing from master (test) to next when he is satisfied with
> > them. People should then base further work in the "next" branch.
> 
> I was under the impression that there was some consensus that -next
> branches should be used for unstable experiments.  Am I mistaken?

Yes,  you are.  It's slightly confusing.  -next branches are for things
decidedly going into the "next" release of the kernel.  If they are
unstable, they aren't really proven to be ready then.

josh

  reply	other threads:[~2008-07-09 16:31 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-09  7:34 Updates to powerpc.git Benjamin Herrenschmidt
2008-07-09 12:58 ` Kumar Gala
2008-07-09 16:08   ` Stephen Rothwell
2008-07-09 16:20     ` Grant Likely
2008-07-09 16:31       ` Josh Boyer [this message]
2008-07-09 16:47         ` Kumar Gala
2008-07-09 17:21           ` Josh Boyer
2008-07-09 17:25           ` Stephen Rothwell
2008-07-09 17:23       ` Stephen Rothwell
2008-07-09 17:30         ` Grant Likely
2008-07-12  3:30   ` Benjamin Herrenschmidt
2008-07-12  3:35     ` Grant Likely
2008-07-09 13:18 ` Josh Boyer
2008-07-09 13:40   ` Kumar Gala
2008-07-09 14:38     ` Grant Likely
2008-07-12  3:32   ` Benjamin Herrenschmidt
2008-07-14  5:32 ` Benjamin Herrenschmidt
2008-07-14  5:49   ` Stephen Rothwell
2008-07-14  8:37     ` Benjamin Herrenschmidt

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=1215621093.32502.1.camel@weaponx \
    --to=jwboyer@linux.vnet.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=grant.likely@secretlab.ca \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=sfr@canb.auug.org.au \
    /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).