On Wed, Feb 05, 2014 at 11:23:22AM -0800, Sarah Sharp wrote: > On Tue, Feb 04, 2014 at 12:44:23PM -0800, Greg Kroah-Hartman wrote: > > On Tue, Feb 04, 2014 at 12:29:22PM -0800, Sarah Sharp wrote: > > > Please pull usb-linus into usb-next, as I have feature patches that rely on > > > 140e3026a57a Revert "usbcore: set lpm_capable field for LPM capable root > > > hubs" > > > > usb-linus and usb-next are now based on 3.14-rc1, so all should be fine > > for you now. > > I don't think that's going to be sufficient. > > The commit I mentioned was one I just sent you for usb-linus. It's a > revert to keep things simple for stable, that touches > usb_device_supports_lpm. Ah, so sorry, you are right, I was thinking you just wanted 3.14-rc1 in usb-next, my mistake. usb-linus and usb-next should be in sync now, if that's not ok, let me know. > The patch I want to add to usb-next reworks usb_device_supports_lpm and > some xHCI code. It's attached, if you want to take a look at it. I'm > happy to queue it to usb-linus if you think it's small enough. That > would be simpler. No, you are right, it should wait for 3.15. Sorry for the confusion, 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