From mboxrd@z Thu Jan 1 00:00:00 1970 From: James Bottomley Subject: Re: [PATCH] usb-storage: implement autosuspend Date: Wed, 28 Jul 2010 17:56:52 -0500 Message-ID: <1280357812.18534.1.camel@mulgrave.site> References: <1280351785.30808.603.camel@mulgrave.site> <20100728212551.GA20508@kroah.com> <1280352582.30808.606.camel@mulgrave.site> <20100728213521.GA22064@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from cantor2.suse.de ([195.135.220.15]:60327 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752785Ab0G1W46 (ORCPT ); Wed, 28 Jul 2010 18:56:58 -0400 In-Reply-To: <20100728213521.GA22064@kroah.com> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: Greg KH Cc: Alan Stern , Matthew Dharm , Oliver Neukum , SCSI development list , USB Storage list On Wed, 2010-07-28 at 14:35 -0700, Greg KH wrote: > On Wed, Jul 28, 2010 at 04:29:42PM -0500, James Bottomley wrote: > > On Wed, 2010-07-28 at 14:25 -0700, Greg KH wrote: > > > On Wed, Jul 28, 2010 at 09:16:25PM +0000, James Bottomley wrote: > > > > On Wed, 2010-07-28 at 17:12 -0400, Alan Stern wrote: > > > > > Because this patch depends on those SCSI changes, either it should also > > > > > go via James's tree or else the SCSI patches should be imported into > > > > > Greg's tree first. James and Greg, which route is easier for you? > > > > > > > > They're USB patches, so they should be in a USB tree. Just do a > > > > standard postmerge tree based on SCSI. > > > > > > Yeah, but then for now my tree will not build on its own, right? > > > > Yes it will: a postmerge tree contains a buildable merge base and the > > additional patches. You can see how this is done at > > > > http://git.kernel.org/?p=linux/kernel/git/jejb/scsi-post-merge-2.6.git > > > > Which contains the ibft tree and scsi-misc as the merge base then has > > be2iscsi patches that depend on both. The tree is individually > > buildable and linux-next only pulls in from merge-base to the top (have > > to make sure it's included after all the other trees, though). > > I think you forgot that I use quilt for my trees :) There is a way of doing this in quilt. I think you checkout my tree, add the patch and some type of annotation for the top so linux-next knows when to pull it in. You just want me to put it in my tree, don't you ... ? James