linux-kernel - Re: [GIT PULL] final scsi updates for 2.6.34-rc1

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]

Date:	Fri, 12 Mar 2010 12:27:21 -0600
From:	James Bottomley <James.Bottomley@...e.de>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-scsi <linux-scsi@...r.kernel.org>,
	linux-kernel <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] final scsi updates for 2.6.34-rc1

On Fri, 2010-03-12 at 10:10 -0800, Linus Torvalds wrote:
> 
> On Wed, 10 Mar 2010, James Bottomley wrote:
> >
> > OK, I know this is a bit late, but no-one told me the merge window was
> > going to close early, but even if they had I'd have been unable to do
> > anything about it, since I've been in transit from India all this week
> > so far (don't ask ...).
> 
> I'm not going to pull.
> 
> The whole "a few days early" was literally aimed at you and some similar 
> people who _always_ send the pull request late, literally the last days.
> 
> I'm fed up with it.
> 
> The damn thing should have been ready when the merge window _opened_, not 
> just before closing. And now there _is_ a tree waiting for me for the next 
> merge window. Goodie.

I do always have a tree ready in the first days of the merge window.  It
was, in fact, here:

commit 654451748b779b28077d9058442d0f354251870d
Merge: 64d497f 77c9cfc
Author: Linus Torvalds <torvalds@...ux-foundation.org>
Date:   Fri Feb 26 16:55:27 2010 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

The slight problem is that I accumulate updates (like almost everyone
else) from the few days before the merge window opened up until about
the middle of the second week.  That's what goes into the final pull,
plus assorted bug fixes that showed up during the window.

I'm not objecting to a shorter merge window, just the unpredictability
of all of this.  The reason I delay the second pull until the last days
of the merge window is so that the proposed changes get the maximum
amount of shake down in linux-next ... and that usually means I close
down the inclusion window about three days before the pull request goes
out.

Personally, I do like the two week merge window, because it shakes out
contributors to me who should have got their act together but didn't.
If you don't like the way this works, fine ... I just need to know what
the parameters are to adjust accordingly, so what is it now?  A 10 day
merge window?

James

--
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/