Re: linux-next: manual merge of the sh tree with the tree

2014-01-09 Thread Simon Horman
[CC Magnus] On Fri, Jan 10, 2014 at 12:55:29PM +1100, Stephen Rothwell wrote: > Hi all, > > On Fri, 10 Jan 2014 09:47:24 +0900 Simon Horman wrote: > > > > On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote: > > > > > > The request to merge the sh code came through Simon with claimed

Re: linux-next: manual merge of the sh tree with the tree

2014-01-09 Thread Stephen Rothwell
Hi all, On Fri, 10 Jan 2014 09:47:24 +0900 Simon Horman wrote: > > On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote: > > > > 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

Re: linux-next: manual merge of the sh tree with the tree

2014-01-09 Thread Simon Horman
On Wed, Jan 08, 2014 at 11:11:03PM -0800, Olof Johansson wrote: > On Sun, Jan 5, 2014 at 5:13 PM, Stephen Rothwell > 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

Re: linux-next: manual merge of the sh tree with the tree

2014-01-08 Thread Olof Johansson
On Sun, Jan 5, 2014 at 5:13 PM, Stephen Rothwell 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-s

linux-next: manual merge of the sh tree with the tree

2014-01-05 Thread Stephen Rothwell
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 c