On Tue, Sep 27, 2011 at 10:20:54AM -0400, Alan Stern wrote: > On Mon, 26 Sep 2011, Greg KH wrote: > > > On Mon, Sep 26, 2011 at 11:24:22AM -0400, Alan Stern wrote: > > > This patch (as1487) improves the usbcore debugging output for port > > > suspend and bus suspend, by stating whether or not remote wakeup is > > > enabled. > > > > > > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > > > > > > --- > > > > > > drivers/usb/core/hcd.c | 9 +++++---- > > > drivers/usb/core/hub.c | 7 +++---- > > > 2 files changed, 8 insertions(+), 8 deletions(-) > > > > > > Index: usb-3.1/drivers/usb/core/hcd.c > > > =================================================================== > > > --- usb-3.1.orig/drivers/usb/core/hcd.c > > > +++ usb-3.1/drivers/usb/core/hcd.c > > > @@ -1961,8 +1961,9 @@ int hcd_bus_suspend(struct usb_device *r > > > int status; > > > int old_state = hcd->state; > > > > > > - dev_dbg(&rhdev->dev, "bus %s%s\n", > > > - (PMSG_IS_AUTO(msg) ? "auto-" : ""), "suspend"); > > > + dev_dbg(&rhdev->dev, "bus %ssuspend, wakeup %d\n", > > > + (PMSG_IS_AUTO(msg) ? "auto-" : ""), > > > + rhdev->do_remote_wakeup); > > > > Did you diff this against the correct tree? This patch doesn't apply at > > all, and the lines above don't match what is currently in my tree, as > > they haven't changed since you did so in 2008. > > Oh dear... No, the diff was made against Rafael's Power Management > tree, for which I submitted the PMSG_IS_AUTO patch earlier. Sorry > about that. > > On the other hand, if I send this to you without the PMSG_IS_AUTO > change, there will be a merge confict later on. What do you suggest? Have Rafael take it instead? I have no objection to it at all, and that keeps any merge issues from happening, so that sounds like the simplest thing to do. 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
