public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@SteelEye.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Andrew Morton <akpm@osdl.org>,
	linux-kernel@vger.kernel.org, "Brown, Len" <len.brown@intel.com>,
	Jeff Garzik <jgarzik@pobox.com>,
	"Luck, Tony" <tony.luck@intel.com>,
	Ben Collins <bcollins@debian.org>,
	Jody McIntyre <scjody@modernduck.com>,
	David Woodhouse <dwmw2@infradead.org>,
	Roland Dreier <rolandd@cisco.com>,
	Dave Jones <davej@codemonkey.org.uk>, Jens Axboe <axboe@suse.de>,
	Dave Kleikamp <shaggy@austin.ibm.com>,
	Steven French <sfrench@us.ibm.com>
Subject: Re: merge status
Date: Wed, 09 Nov 2005 17:25:23 -0500	[thread overview]
Message-ID: <1131575124.8541.9.camel@mulgrave> (raw)
In-Reply-To: <Pine.LNX.4.64.0511091358560.4627@g5.osdl.org>

On Wed, 2005-11-09 at 14:01 -0800, Linus Torvalds wrote:
> 
> On Wed, 9 Nov 2005, James Bottomley wrote:
> >
> > On Wed, 2005-11-09 at 13:35 -0800, Andrew Morton wrote:
> > > -rw-r--r--    1 akpm     akpm       339882 Nov  9 11:19 git-scsi-misc.patch
> > 
> > This one is all 2.6.15 material.  I think I now (as of one minute ago)
> > have it updated to the last of the 2.6.15 (barring bug fix) patches.
> > I'd like to regression test it for a day or two, so I plan to request
> > the final merger on Friday.
> 
> I'm hoping there aren't any infrastructure upheavals that break drivers 
> again, because if there are, I think we're going to have to make a 
> separate rule for things like that: they have to be merged early in the 
> sequence or not at all.

There are one or two.  Part of the delay is getting sign offs from all
the people involved.

> And in _general_ I find it very wrong to consciously leave the merge until 
> the last day of the merge window.

Well ... I can give you the URL to pull now if you want ... I'd just
prefer to give this lot another day or so of testing.

> If that keeps happening, I think I'll just make sure that I don't always 
> merge on the last day or two. Just to make sure that submaintainers don't 
> "game" the system the wrong way. Maybe my "two weeks" are sometimes just 
> ten days long, who knows..

That's a nice theory, except that it's my contributors who drop me in it
by leaving their patch sets until you declare a kernel, dumping the
integration testing on me in whatever time window is left.

James



  reply	other threads:[~2005-11-09 22:25 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-09 21:35 merge status Andrew Morton
2005-11-09 21:50 ` James Bottomley
2005-11-09 22:01   ` Linus Torvalds
2005-11-09 22:25     ` James Bottomley [this message]
2005-11-09 22:43       ` Linus Torvalds
2005-11-10  7:16         ` Jeff Garzik
2005-11-09 23:01       ` Andrew Morton
2005-11-09 23:09         ` Jesper Juhl
2005-11-09 23:58         ` Linus Torvalds
2005-11-10 13:28           ` Pavel Machek
2005-11-10  0:16         ` Con Kolivas
2005-11-10  0:25           ` Andrew Morton
2005-11-10  0:24         ` James Bottomley
2005-11-10  8:40         ` Jens Axboe
2005-11-10  8:56           ` Andrew Morton
2005-11-10  9:22             ` Jens Axboe
2005-11-10  9:30               ` Andrew Morton
2005-11-10  9:57                 ` git branches strategy (was Re: merge status) Jeff Garzik
2005-11-10 13:22                 ` merge status Dave Kleikamp
2005-11-10 13:26         ` Pavel Machek
2005-11-14 20:13         ` Bill Davidsen
2005-11-09 22:05 ` Roland Dreier
2005-11-09 22:12 ` Jody McIntyre
2005-11-09 22:18   ` Linus Torvalds
2005-11-09 22:23     ` Jody McIntyre
2005-11-09 22:45       ` Andrew Morton
2005-11-09 22:48       ` Linus Torvalds
2005-11-09 22:13 ` Anton Altaparmakov
2005-11-09 22:48   ` Andrew Morton
2005-11-09 22:58     ` Linus Torvalds
2005-11-09 22:41 ` Russell King
2005-11-10  7:20 ` Jeff Garzik
2005-11-10  8:41 ` Jens Axboe
     [not found] <OF4A6DAD74.A56B078E-ON872570B4.007A77CE-862570B4.007AC8BB@us.ibm.com>
2005-11-09 22:23 ` David Woodhouse
  -- strict thread matches above, loose matches on Subject: below --
2005-11-09 22:54 Luck, Tony
2005-11-09 23:21 ` Andrew Morton
2005-11-10  7:38 Brown, Len
2005-11-10  7:47 ` Jeff Garzik
2005-11-10  8:19   ` Keith Owens
2005-11-10 17:17 Luck, Tony

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=1131575124.8541.9.camel@mulgrave \
    --to=james.bottomley@steeleye.com \
    --cc=akpm@osdl.org \
    --cc=axboe@suse.de \
    --cc=bcollins@debian.org \
    --cc=davej@codemonkey.org.uk \
    --cc=dwmw2@infradead.org \
    --cc=jgarzik@pobox.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rolandd@cisco.com \
    --cc=scjody@modernduck.com \
    --cc=sfrench@us.ibm.com \
    --cc=shaggy@austin.ibm.com \
    --cc=tony.luck@intel.com \
    --cc=torvalds@osdl.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