From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Christoph Hellwig <hch@infradead.org>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>
Subject: Re: [ANNOUNCE] scsi patch queue tree updated
Date: Mon, 04 Aug 2014 07:20:04 -0700 [thread overview]
Message-ID: <1407162004.4243.1.camel@jarvis.lan> (raw)
In-Reply-To: <20140804111147.GA29148@infradead.org>
On Mon, 2014-08-04 at 04:11 -0700, Christoph Hellwig wrote:
> On Fri, Aug 01, 2014 at 04:32:01PM -0400, James Bottomley wrote:
> > On Fri, 2014-08-01 at 05:20 -0700, Christoph Hellwig wrote:
> > > I've pushed out updates to both the core-for-3.17 and drivers-for-3.17
> > > branches.
> >
> > So I'm afraid we missed the last -next build on these, so they can't go
> > in with the early SCSI pull. I'm open to doing one mid merge window,
> > but Linus tends not to like that.
>
> I don't think there are any hard and fast rules.
True, but the hardest of our semi-liquid rules is nothing in the merge
window that wasn't in -next first.
> The core-for-3.17 commit is a trivial printk specifier regression fix for
> something introduced in the 3.17 merge window, so pulling it in is
> an absolute non-brainer.
>
> The drivers side are a bunch of smaller fixes for iscsi and pm8001 which
> never have been a problem to put in near the end of the merge window,
> especially if they have a few more days linux-next exposure in
> Linux-next even after the 3.16 release. They absolutely would be
> candidates for a second pull even if they'd miss the first pull.
OK, since I have to do a second pull anyway we might as well follow the
rules.
James
next prev parent reply other threads:[~2014-08-04 14:20 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-08 13:40 [ANNOUNCE] scsi patch queue tree updated Christoph Hellwig
2014-08-01 12:20 ` Christoph Hellwig
2014-08-01 20:32 ` James Bottomley
2014-08-04 11:11 ` Christoph Hellwig
2014-08-04 11:30 ` Stephen Rothwell
2014-08-04 11:34 ` Christoph Hellwig
2014-08-04 11:39 ` Stephen Rothwell
2014-08-04 14:20 ` James Bottomley [this message]
2014-08-14 12:54 ` Christoph Hellwig
2014-08-14 17:47 ` James Bottomley
2014-08-15 19:25 ` Christoph Hellwig
2014-08-15 19:32 ` James Bottomley
2014-09-15 22:58 ` Christoph Hellwig
2014-09-16 21:37 ` Christoph Hellwig
2014-09-16 21:44 ` James Bottomley
2014-12-30 13:02 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2014-07-18 10:02 Christoph Hellwig
2014-07-25 21:19 ` Christoph Hellwig
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=1407162004.4243.1.camel@jarvis.lan \
--to=james.bottomley@hansenpartnership.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).