public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@suse.de>
To: Greg KH <greg@kroah.com>
Cc: Alan Stern <stern@rowland.harvard.edu>,
	Matthew Dharm <mdharm-usb@one-eyed-alien.net>,
	Oliver Neukum <oliver@neukum.org>,
	SCSI development list <linux-scsi@vger.kernel.org>,
	USB Storage list <usb-storage@lists.one-eyed-alien.net>
Subject: Re: [PATCH] usb-storage: implement autosuspend
Date: Wed, 28 Jul 2010 17:56:52 -0500	[thread overview]
Message-ID: <1280357812.18534.1.camel@mulgrave.site> (raw)
In-Reply-To: <20100728213521.GA22064@kroah.com>

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






  reply	other threads:[~2010-07-28 22:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-28 21:12 [PATCH] usb-storage: implement autosuspend Alan Stern
2010-07-28 21:16 ` James Bottomley
2010-07-28 21:25   ` Greg KH
2010-07-28 21:29     ` James Bottomley
2010-07-28 21:35       ` Greg KH
2010-07-28 22:56         ` James Bottomley [this message]
2010-07-28 23:09           ` Greg KH
2010-07-29 14:14             ` Alan Stern
2010-07-29 14:19               ` Greg KH
2010-08-02 14:36 ` Oliver Neukum
2010-08-02 15:07   ` Alan Stern
2010-08-02 23:47 ` patch "USB: usb-storage: implement autosuspend" added to gregkh-2.6 tree gregkh

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=1280357812.18534.1.camel@mulgrave.site \
    --to=james.bottomley@suse.de \
    --cc=greg@kroah.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mdharm-usb@one-eyed-alien.net \
    --cc=oliver@neukum.org \
    --cc=stern@rowland.harvard.edu \
    --cc=usb-storage@lists.one-eyed-alien.net \
    /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