lkml.org 
[lkml]   [2013]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [GIT PULL] block fixes for 3.9-rc
On Fri, Mar 29 2013, Linus Torvalds wrote:
> On Fri, Mar 29, 2013 at 11:24 AM, Jens Axboe <axboe@kernel.dk> wrote:
> >
> >> Don't do this kind of thing. That branch is pointless, and just
> >> confused you.
> >
> > Tag, you mean?
>
> No. Branch. Why would you have a public branch called "for-linus",
> when you intend to tag the end result before sending it to me?

Outside of "that's what I have always done", the intent was for others
that send patches through me to know what to base it off, if not
previous release. All those folks know that for-3.x/drivers is for the
next x release, and that for-linus is for the existing tree.

> It would make much more sense if you just did your development in your
> "master" branch, perhaps with a separate branch for fixes during
> stabilization (so that you don't mix up fixes with your future
> development. Call it "fixes" or "stable" or whatever. No "for-linus"
> branches anywhere. After all, the branch isn't for me at all. It's for
> me only once you're ready. And at that point you tag it, so having a
> *tag* called for-linus makes sense and gives us the nice signing etc.

I see your point, it's not for you YET but it will be soon. I'd rather
just keep that naming to avoid confusion with others, but tag it
appropriately (for-linus-<date>?) when it's headed your way. Then use
that proper signed tag name as the reference to you.

I prefer keeping 'master' pristine.

--
Jens Axboe



\
 
 \ /
  Last update: 2013-03-29 20:41    [W:0.040 / U:1.152 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site