From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Chris Metcalf <cmetcalf@tilera•com>,
Srinivas Kandagatla <srinivas.kandagatla@st•com>
Subject: linux-next: manual merge of the tty tree with the tile tree
Date: Tue, 13 Aug 2013 15:43:46 +1000 [thread overview]
Message-ID: <20130813154346.fb2e52f791fb6e2e3e2fbfcc@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2013-08-13 5:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 5:43 Stephen Rothwell [this message]
2013-08-13 6:12 ` linux-next: manual merge of the tty tree with the tile tree Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130813154346.fb2e52f791fb6e2e3e2fbfcc@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cmetcalf@tilera$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=srinivas.kandagatla@st$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox