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,
Feng Tang <feng.tang@intel•com>,
Guennadi Liakhovetski <g.liakhovetski@gmx•de>,
Paul Mundt <lethal@linux-sh•org>
Subject: linux-next: manual merge of the tty tree with the genesis tree
Date: Tue, 27 Jul 2010 14:34:30 +1000 [thread overview]
Message-ID: <20100727143430.05c018fc.sfr@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
include/linux/serial_core.h between commit
75b93489b449db4a34f0424c72f51821d985f52f ("serial: add a new port type,
found on some sh-mobile SoCs") from the genesis tree and commit
c3190cf68dfc58c33de0fd59b919cbb864acbba4 ("hsu: driver for Medfield High
Speed UART device") from the tty tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc include/linux/serial_core.h
index 5228320,f8fce35..0000000
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@@ -186,9 -186,12 +186,15 @@@
#define PORT_ALTERA_JTAGUART 91
#define PORT_ALTERA_UART 92
+/* SH-SCI */
+#define PORT_SCIFB 93
+
+ /* MAX3107 */
+ #define PORT_MAX3107 94
+
+ /* High Speed UART for Medfield */
+ #define PORT_MFD 95
+
#ifdef __KERNEL__
#include <linux/compiler.h>
next reply other threads:[~2010-07-27 4:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 4:34 Stephen Rothwell [this message]
2010-07-27 4:47 ` linux-next: manual merge of the tty tree with the genesis tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2010-07-09 3:49 Stephen Rothwell
2010-07-09 5:04 ` 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=20100727143430.05c018fc.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=feng.tang@intel$(echo .)com \
--cc=g.liakhovetski@gmx$(echo .)de \
--cc=greg@kroah$(echo .)com \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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