On Sun, Oct 05, 2014 at 11:18:49AM +0200, Hans de Goede wrote: > Hi, > > On 10/05/2014 11:10 AM, Christoph Hellwig wrote: > > On Sun, Oct 05, 2014 at 11:06:00AM +0200, Hans de Goede wrote: > >> This patch sits on top of a lot of other uas fixes which are already > >> in usb-next, so this needs to go in through usb-next. > > > > What is the actual conflict? If it's just your revert of the > > disable_blk_mq flag > > Yes, the conclict is just my revert of the disable_blk_mq flag > > > you might want to skip that for this pull request > > and send it on after both scsi and usb trees make it to Linus. > > Since the patch with the conclict actually makes the flag unnecessary, > to me this belongs in the same patch. > > > If there's more conflict around the host template you could cherry pick > > my patch for your tree. > > Yes, Greg cherry picking the patch in question into his tree to resolv > the conflict would be my preferred solution to this, but ultimately > that is Greg's call. I'm not going to do that, just resend it to me after 3.18-rc1 is out, my tree is closed for the -rc1 merge window now anyway. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
