linux-kernel - Re: [GIT PULL] block fixes for 3.9-rc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130329190017.GE2567@kernel.dk>
Date:	Fri, 29 Mar 2013 13:00:17 -0600
From:	Jens Axboe <axboe@...nel.dk>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [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@...nel.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/