* linux-next: manual merge of the renesas tree with the tty tree
@ 2013-06-17 7:16 Stephen Rothwell
2013-06-17 19:35 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-06-17 7:16 UTC (permalink / raw)
To: Simon Horman
Cc: linux-next, linux-kernel, Jingchang Lu, Greg KH, Ulrich Hecht
[-- Attachment #1: Type: text/plain, Size: 882 bytes --]
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@canb•auug.org.au
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
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: linux-next: manual merge of the renesas tree with the tty tree
2013-06-17 7:16 linux-next: manual merge of the renesas tree with the tty tree Stephen Rothwell
@ 2013-06-17 19:35 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2013-06-17 19:35 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Simon Horman, linux-next, linux-kernel, Jingchang Lu,
Ulrich Hecht
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@canb•auug.org.au
>
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-06-17 19:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-17 7:16 linux-next: manual merge of the renesas tree with the tty tree Stephen Rothwell
2013-06-17 19:35 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox