Messages in this thread | | | Date | Mon, 6 Jan 2014 12:13:17 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the sh tree with the tree |
| |
Hi Paul,
Today's linux-next merge of the sh tree got conflicts in drivers/tty/serial/sh-sci.c and include/linux/serial_sci.h between commits 8fb9631c517b ("serial: sh-sci: Sort headers alphabetically"), 20bdcab8268c ("serial: sh-sci: Add OF support") and probably others from the arm-soc tree and commits ada80ee7fa60 ("serial: sh-sci: Add OF support") and b19ef75c56e9 ("serial: sh-sci: OF definitions need linux/of.h") from the sh tree.
The arm-soc tree version is dated much more recently than the sh tree version and conflicts badly, so for today I have just dropped the sh tree (everything in there was committed before April 2013). Please figure this out.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |