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 :) thanks, greg "old-skool" k-h -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
