Messages in this thread | | | Subject | Re: [ANNOUNCE] scsi patch queue tree updated | From | James Bottomley <> | Date | Mon, 04 Aug 2014 07:20:04 -0700 |
| |
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
| |