Messages in this thread | | | Date | Thu, 10 Feb 2011 16:29:14 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the m68knommu tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/tty/serial/68328serial.c between commit abf67e214f867d16df6a9c4ac7d8fc0b98ebad97 ("m68knommu: fix derefernce of port.tty") from the m68knommu tree and commit f094298bae5f5d0e1cb3bff4621aae7ef486812a ("68328serial: remove unsed m68k_serial->tqueue_hangup") from the tty tree.
I just used the latter since it removed some of the code modified by the former. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |