diff options
| author | Greg Kroah-Hartman | 2013-08-20 01:57:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-08-20 01:57:51 +0200 |
| commit | 4c4e15966df37b0d3863a76b47fc2929ac9e9123 (patch) | |
| tree | 748e51bd8b0d84afba9907c9bf73d970a02807ea /drivers/usb/gadget/Kconfig | |
| parent | Merge 3.11-rc6 into usb-next (diff) | |
| parent | Merge tag 'for-usb-2013-08-15-step-1' into for-usb-next (diff) | |
| download | kernel-qcow2-linux-4c4e15966df37b0d3863a76b47fc2929ac9e9123.tar.gz kernel-qcow2-linux-4c4e15966df37b0d3863a76b47fc2929ac9e9123.tar.xz kernel-qcow2-linux-4c4e15966df37b0d3863a76b47fc2929ac9e9123.zip | |
Merge tag 'for-usb-2013-08-15-step-2' of ra.kernel.org:/pub/scm/linux/kernel/git/sarah/xhci into work-next
Sarah writes:
xhci: Step 2 to fix usb-linus and usb-next.
Hi Greg,
This is the first of two 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 two.
Sarah Sharp
Diffstat (limited to 'drivers/usb/gadget/Kconfig')
0 files changed, 0 insertions, 0 deletions