Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/serial/io_ti.c between commit d12b219a228efe92f0778ed3af21305e65fbb052 ("edgeport-ti: use request_firmware()") from Linus' tree and commit 1f023570c8d00d3511799ccad21dc3525a6160e1 ("USB: io_ti: FIrst cut at a big clean up") from the usb tree. This conflict used to be in the firmware tree and my solution then was to remove the commit now in Linus' tree because the fixup was going to take to long. Now my solution is to remove the commit from the usb tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/