On Wed, Oct 16, 2013 at 3:58 PM, Sarah Sharp
<sarah.a.sharp@xxxxxxxxxxxxxxx> wrote:
> Hi Dan,
>
> I'm attempting to put my queue together for usb-next, and this patch
> doesn't apply, due to conflicts in the USB core. Can you rebase this
> patchset on top of my for-usb-next-queue branch, and resend the last two
> patches? The first three applied fine.
Hooray for whitespace fix collisions. git am is very strict by
default. We collided with:
commit 469271f8c48f12efc63a49b5bb388a754c957a0b
Author: Matthias Beyer <mail@xxxxxxxxxxxxxxxx>
Date: Thu Oct 10 23:41:27 2013 +0200
drivers: usb: core: {file,hub,sysfs,usb}.c: Whitespace fixes
including:
- removing of trailing whitespace
- removing spaces before array indexing (foo [] to foo[])
- reindention of a switch-case block
- spaces to tabs
Signed-off-by: Matthias Beyer <mail@xxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
...and my tree was based on usb-next.
The rebase only made this change to patch 4 (diff of the diffs)
-@@ -4167,7 +4203,7 @@ hub_port_init (struct usb_hub *hub, struct
usb_device *udev, int port1,
+@@ -4158,7 +4194,7 @@ hub_port_init (struct usb_hub *hub, struct
usb_device *udev, int port1,
* - read ep0 maxpacket even for high and low speed,
*/
msleep(10);
- if (USE_NEW_SCHEME(retry_counter) &&
!(hcd->driver->flags & HCD_USB3))
+ if (did_new_scheme)
break;
- }
+ }
...to spare the list I just attached the updated set.
--
Dan
Attachment:
xhci-new-scheme-v3.tar.gz
Description: GNU Zip compressed data
