Messages in this thread | | | Date | Mon, 25 May 2015 18:19:38 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tty tree with the tty.current tree |
| |
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in drivers/tty/serial/amba-pl011.c between commit 43dd1f9a5b05 ("serial/amba-pl011: Unconditionally poll for FIFO space before each TX char") from the tty.current tree and commit 1e84d22322ce ("serial/amba-pl011: Refactor and simplify TX FIFO handling") from the tty tree.
I fixed it up (I just used the version from the tty tree) 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] | |