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

[Greg KH]

On Tue, Aug 13, 2013 at 03:43:46PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the tty tree got a conflict in
> include/uapi/linux/serial_core.h between commit 002abee2d681 ("tilegx:
> Add tty serial support for TILE-Gx on-chip UART") from the tile tree and
> commit c4b058560762 ("serial:st-asc: Add ST ASC driver") from the tty
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Fix looks fine 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  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/