Messages in this thread | | | Date | Mon, 5 Aug 2013 13:25:48 +0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the sh tree |
| |
On Mon, Aug 05, 2013 at 03:04:56PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/serial/sh-sci.c between commit ada80ee7fa60 ("serial: sh-sci: > Add OF support") from the sh tree and commit 3ba35baa55fa ("serial: > sh-sci: use dev_get_platdata()") from the tty tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks.
greg k-h
| |