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

[Greg KH]

On Mon, Jun 17, 2013 at 05:16:22PM +1000, Stephen Rothwell wrote:
> Hi Simon,
> 
> Today's linux-next merge of the renesas tree got a conflict in
> include/uapi/linux/serial_core.h between commit c9e2e946fb0b ("tty:
> serial: add Freescale lpuart driver support") from the tty tree and
> commit 24610a30600b ("serial: sh-sci: HSCIF support") from the renesas
> tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
> 
> diff --cc include/uapi/linux/serial_core.h
> index c8eaeb5,26eee07..0000000
> --- a/include/uapi/linux/serial_core.h
> +++ b/include/uapi/linux/serial_core.h
> @@@ -226,7 -226,7 +226,10 @@@
>   /* Rocketport EXPRESS/INFINITY */
>   #define PORT_RP2	102
>   
>  +/* Freescale lpuart */
>  +#define PORT_LPUART	103
>  +
> + /* SH-SCI */
>  -#define PORT_HSCIF	103
> ++#define PORT_HSCIF	104

Looks correct 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/