2013-05-31 16:33:08

by jon ernst

[permalink] [raw]
Subject: dev branch or master branch?

Hi list,

Patches that people send to this list,  are those against to dev branch or master branch?


Thanks!


2013-05-31 16:55:57

by Zheng Liu

[permalink] [raw]
Subject: Re: dev branch or master branch?

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/

Regards,
- Zheng

2013-05-31 23:07:12

by Theodore Ts'o

[permalink] [raw]
Subject: Re: dev branch or master branch?

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