Hi Alan,

Today's linux-next merge of the ttydev tree got a conflict in
drivers/usb/serial/cypress_m8.c between commit
3355625b2b58b213e481b071aa01d15240f0d8dd ("USB: removal of
tty->low_latency hack dating back to the old serial code") from the
usb.current tree and commit 1156df675ae541b21dc343912413f201f87a3909
("tty-usb-use-port") from the ttydev tree.

Each patch just removes code next to the code removed by the other.  I
fixed it up and can carry the fix. as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/