On Sun, Jan 5, 2014 at 5:13 PM, Stephen Rothwell [off-list ref] wrote:

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.

The request to merge the sh code came through Simon with claimed
agreement from SH maintainers to do so -- I didn't verify this since
they have in the past been well-coordinated. Simon?



-Olof