Messages in this thread | | | Date | Thu, 21 Mar 2013 15:24:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with the usb.current tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ehci-timer.c between commit d714aaf64946 ("USB: EHCI: fix regression in QH unlinking") from the usb.current tree and commit 60fd4aa742a0 ("USB: EHCI: reorganize ehci_iaa_watchdog()") from the usb tree.
I assume that the latter fixed the problem fixed by the former, so just used the latter and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |