lkml.org 
[lkml]   [2013]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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]
\
 
 \ /
  Last update: 2013-03-21 06:01    [W:0.020 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site