On Tue, 2009-11-10 at 13:58 -0500, Martin K. Petersen wrote: > >>>>> "Christoph" == Christoph Hellwig <hch@xxxxxxxxxxxxx> writes: > > >> Ok. Jens, please queue the patch below. And then we'll have to see > >> about getting James to rebase and/or postpone the SCSI portion to > >> round #2. > > Christoph> Can't we please get both patches in through one tree? > Christoph> Everything else is a bit of a pain to manage. > > I'm intimately familiar with said pain. Pretty much everything I do > touches both block and scsi :/ > > But James has been pretty good about rebasing scsi-misc on top of Jens' > tree. That's how we've done all the other tricky merges. > > James, what do you think? SCSI pretty much pioneered the use of postmerge trees, which is how I do this ... if everyone's happy, that's what I'll do this time. James -- 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
