linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Theodore Ts'o <tytso@mit.edu>
To: jon ernst <jonernst07@gmx.com>, linux-ext4@vger.kernel.org
Subject: Re: dev branch or master branch?
Date: Fri, 31 May 2013 19:07:07 -0400	[thread overview]
Message-ID: <20130531230707.GA23048@thunk.org> (raw)
In-Reply-To: <20130531171352.GA6915@gmail.com>

On Sat, Jun 01, 2013 at 01:13:52AM +0800, Zheng Liu wrote:
> On Fri, May 31, 2013 at 12:33:05PM -0400, jon ernst wrote:
> > Hi list,
> >  
> > Patches that people send to this list,  are those against to dev branch or master branch?
> 
> You'd better send a patch that bases against dev branch.  You can clone
> ext4 tree from here:
>   https://git.kernel.org/cgit/linux/kernel/git/tytso/ext4.git/

Note that the dev branch is rewinding, so sometimes patches will drop
from it.  So it is a bit dangerous to base a git branch on the dev
branch if you care about this sort of thing.  But if you are
submitting patches, that shouldn't be a major problem.

Normally the master branch will be between origin and dev (where
origin is the commit from Linus's mainline kernel tree from which we
do development during a particular development cycle).  Currently the
origin branch is at v3.10-rc2.  I had forgotten to push the master
branch forward until very recently; I've just fixed this.

Normally I'll push the master branch forward after the patches have
fully passed a regression test run and we're confident that we don't
need to modify the patches between origin and master.

Hope this helps,

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

      reply	other threads:[~2013-05-31 23:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-31 16:33 dev branch or master branch? jon ernst
2013-05-31 17:13 ` Zheng Liu
2013-05-31 23:07   ` Theodore Ts'o [this message]

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=20130531230707.GA23048@thunk.org \
    --to=tytso@mit.edu \
    --cc=jonernst07@gmx.com \
    --cc=linux-ext4@vger.kernel.org \
    /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).