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

From: Greg KH
Date: Mon Aug 05 2013 - 01:24:41 EST

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
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at