The following changes since commit ff8a43c10f1440f07a5faca0c1556921259f7f76: USB: keyspan: fix null-deref at disconnect and release (2013-08-14 12:49:27 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci.git tags/for-usb-2013-08-15-step-1 for you to fetch changes up to 52fb61250a7a132b0cfb9f4a1060a1f3c49e5a25: xhci-plat: Don't enable legacy PCI interrupts. (2013-08-15 10:52:36 -0700) ---------------------------------------------------------------- xhci: Step 1 to fix usb-linus and usb-next. Hi Greg, This is the first of three steps to fix your usb-linus and usb-next trees. As I mentioned, commit 4fae6f0fa86f92e6bc7429371b1e177ad0aaac66 "USB: handle LPM errors during device suspend correctly" was incorrectly added to usb-next when it should have been added to usb-linus and marked for stable. Two port power off bug fixes touch the same code that patch touches, but it's not easy to simply move commit 4fae6f0f patch to usb-linus because commit 28e861658e23ca94692f98e245d254c75c8088a7 "USB: refactor code for enabling/disabling remote wakeup" also touched those code sections. I propose a two step process to fix this: 1. Pull these four patches into usb-linus. 2. Revert commit 28e861658e23ca94692f98e245d254c75c8088a7 from usb-next. Merge usb-linus into usb-next, and resolve the conflicts. I will be sending pull requests for these steps. This pull request is step one, and contains the backported version of commit 4fae6f0fa86f92e6bc7429371b1e177ad0aaac66, the two port power off fixes, and an unrelated xhci-plat bug fix. Sarah Sharp ---------------------------------------------------------------- Alan Stern (1): USB: handle LPM errors during device suspend correctly Lan Tianyu (1): usb: don't check pm qos NO_POWER_OFF flag in usb_port_suspend() Sarah Sharp (2): usb: Don't fail port power resume on device disconnect. xhci-plat: Don't enable legacy PCI interrupts. drivers/usb/core/hub.c | 65 +++++++++++++++++++---------------------- drivers/usb/core/port.c | 13 +++----- drivers/usb/host/xhci-plat.c | 2 +- drivers/usb/host/xhci.c | 7 ++++- drivers/usb/host/xhci.h | 1 + 5 files changed, 43 insertions(+), 45 deletions(-) -- 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