Messages in this thread | | | Date | Wed, 23 Sep 2009 16:38:17 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with Linus' tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in arch/x86/kernel/early_printk.c between commit 414128bd33fef3242747154dfa444970bc5caf4c ("x86: Increase timeout for EHCI debug port reset completion in early printk") from Linus' tree and commit bd965307ef6b7a56219f8883d5038f6573a94f6e ("USB: ehci,dbgp,early_printk: split ehci debug driver from early_printk.c") from the usb tree.
The latter moved the code that the former modified. A later USB patch used an even longer loop delay.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |