On Tue, Aug 06, 2013 at 02:48:57PM -0400, Alan Stern wrote: > On Tue, 6 Aug 2013, Sarah Sharp wrote: > > > On Tue, Aug 06, 2013 at 10:16:15AM -0400, Alan Stern wrote: > > > Patch 1 has been rendered out of date by intervening changes (commit > > > 4fae6f0fa86f in Greg's usb-next tree). > > > > Greg, could that be marked for stable? I'm not sure why it's in > > usb-next; it should really be in usb-linus, since it's a bug fix. The > > USB port power off mechanism doesn't work for suspended USB devices > > without it. > > That commit does not do exactly the same thing as your patch 1. It > keeps the NO_POWER_OFF check in usb_port_suspend(), among other things. > I didn't mean to imply that patch 1 was unnecessary, just that it was > out of date and would cause a merge conflict when Greg tried to apply > it to the current tree. Ah, ok. It sounds like we need both patches for stable, and I should rebase patch 1 against yours. I can either queue the rebased patch for usb-next and mention that it (and your patch) should be queued for stable, or Greg could revert yours from usb-next, move it to usb-linus, and I could send my patch to usb-linus. Greg, how do you want to handle this? Sarah Sharp -- 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
