* linux-next: manual merge of the tty tree with the tile tree
@ 2013-08-13 5:43 Stephen Rothwell
2013-08-13 6:12 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2013-08-13 5:43 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Chris Metcalf, Srinivas Kandagatla
[-- Attachment #1: Type: text/plain, Size: 889 bytes --]
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/uapi/linux/serial_core.h
index b466487,e40ebe1..0000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -232,7 -232,7 +232,10 @@@
/* SH-SCI */
#define PORT_HSCIF 104
+/* Tilera TILE-Gx UART */
+#define PORT_TILEGX 105
+
+ /* ST ASC type numbers */
-#define PORT_ASC 105
++#define PORT_ASC 106
+
#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 tty tree with the tile tree
2013-08-13 5:43 linux-next: manual merge of the tty tree with the tile tree Stephen Rothwell
@ 2013-08-13 6:12 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2013-08-13 6:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Chris Metcalf, Srinivas Kandagatla
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-13 6:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-13 5:43 linux-next: manual merge of the tty tree with the tile tree Stephen Rothwell
2013-08-13 6:12 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).