From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Ralf Baechle <ralf@linux-mips•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Andrei Pistirica <andrei.pistirica@microchip•com>,
Joshua Henderson <joshua.henderson@microchip•com>,
Vladimir Murzin <vladimir.murzin@arm•com>
Subject: linux-next: manual merge of the tty tree with the mips tree
Date: Mon, 2 May 2016 15:52:01 +1000 [thread overview]
Message-ID: <20160502155201.306e1cef@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in:
drivers/tty/serial/Makefile
include/uapi/linux/serial_core.h
between commit:
a484a06f7cb1 ("serial: pic32_uart: Add PIC32 UART driver")
from the mips tree and commit:
041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
from the tty tree.
I fixed it up (see below - I assume the numbers in
uapi/linux/serial_core.h are meant to be unique?) and can carry the fix
as necessary. This is now fixed as far as linux-next is concerned, but
any non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/tty/serial/Makefile
index 74914aafac61,81e9057a0f68..000000000000
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -91,7 -91,7 +91,8 @@@ obj-$(CONFIG_SERIAL_MEN_Z135) += men_z1
obj-$(CONFIG_SERIAL_SPRD) += sprd_serial.o
obj-$(CONFIG_SERIAL_STM32) += stm32-usart.o
obj-$(CONFIG_SERIAL_MVEBU_UART) += mvebu-uart.o
+ obj-$(CONFIG_SERIAL_MPS2_UART) += mps2-uart.o
+obj-$(CONFIG_SERIAL_PIC32) += pic32_uart.o
# GPIOLIB helpers for modem control lines
obj-$(CONFIG_SERIAL_MCTRL_GPIO) += serial_mctrl_gpio.o
diff --cc include/uapi/linux/serial_core.h
index a539a638ec10,9aef04c5f7bc..000000000000
--- a/include/uapi/linux/serial_core.h
+++ b/include/uapi/linux/serial_core.h
@@@ -264,7 -264,7 +264,10 @@@
/* MVEBU UART */
#define PORT_MVEBU 114
+ /* MPS2 UART */
+ #define PORT_MPS2UART 115
+
+/* Microchip PIC32 UART */
- #define PORT_PIC32 114
++#define PORT_PIC32 116
+
#endif /* _UAPILINUX_SERIAL_CORE_H */
next reply other threads:[~2016-05-02 5:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-02 5:52 Stephen Rothwell [this message]
2016-05-02 15:28 ` linux-next: manual merge of the tty tree with the mips tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-06-09 10:59 Stephen Rothwell
2015-06-09 21:10 ` Greg KH
2011-11-18 3:22 Stephen Rothwell
2011-11-18 16:19 ` 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=20160502155201.306e1cef@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=andrei.pistirica@microchip$(echo .)com \
--cc=greg@kroah$(echo .)com \
--cc=joshua.henderson@microchip$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ralf@linux-mips$(echo .)org \
--cc=vladimir.murzin@arm$(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