* linux-next: manual merge of the tty tree with the mips tree
@ 2016-05-02 5:52 Stephen Rothwell
2016-05-02 15:28 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2016-05-02 5:52 UTC (permalink / raw)
To: Greg KH, Ralf Baechle
Cc: linux-next, linux-kernel, Andrei Pistirica, Joshua Henderson,
Vladimir Murzin
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 */
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the mips tree
2016-05-02 5:52 linux-next: manual merge of the tty tree with the mips tree Stephen Rothwell
@ 2016-05-02 15:28 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2016-05-02 15:28 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ralf Baechle, linux-next, linux-kernel, Andrei Pistirica,
Joshua Henderson, Vladimir Murzin
On Mon, May 02, 2016 at 03:52:01PM +1000, Stephen Rothwell wrote:
> 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?)
Yes they are, thanks. It's a horrid old api :(
> 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.
Fix looks good to me, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the mips tree
2015-06-09 10:59 Stephen Rothwell
@ 2015-06-09 21:10 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2015-06-09 21:10 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Ralf Baechle, linux-next, linux-kernel, Paul Burton, Masahiro Yamada
On Tue, Jun 09, 2015 at 08:59:53PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got conflicts in
> drivers/tty/serial/8250/Kconfig and drivers/tty/serial/8250/Makefile
> between commit d4a7bd1c0e5e ("serial: 8250_ingenic: support for Ingenic
> SoC UARTs") from the mips tree and commit 1a8d2903cb6a ("serial:
> 8250_uniphier: add UniPhier serial 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 drivers/tty/serial/8250/Kconfig
> index 43330ea95cfd,a74a8e4717d4..000000000000
> --- a/drivers/tty/serial/8250/Kconfig
> +++ b/drivers/tty/serial/8250/Kconfig
> @@@ -343,11 -351,9 +351,18 @@@ config SERIAL_8250_MT657
> If you have a Mediatek based board and want to use the
> serial port, say Y to this option. If unsure, say N.
>
> +config SERIAL_8250_INGENIC
> + bool "Support for Ingenic SoC serial ports"
> + depends on SERIAL_8250_CONSOLE && OF_FLATTREE
> + select LIBFDT
> + select SERIAL_EARLYCON
> + help
> + If you have a system using an Ingenic SoC and wish to make use of
> + its UARTs, say Y to this option. If unsure, say N.
> ++
> + config SERIAL_8250_UNIPHIER
> + tristate "Support for UniPhier on-chip UART"
> + depends on SERIAL_8250 && ARCH_UNIPHIER
> + help
> + If you have a UniPhier based board and want to use the on-chip
> + serial ports, say Y to this option. If unsure, say N.
> diff --cc drivers/tty/serial/8250/Makefile
> index 98fba26e194a,6fa22ffad63d..000000000000
> --- a/drivers/tty/serial/8250/Makefile
> +++ b/drivers/tty/serial/8250/Makefile
> @@@ -22,7 -22,6 +22,9 @@@ obj-$(CONFIG_SERIAL_8250_DW) += 8250_d
> obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o
> obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o
> obj-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
> + obj-$(CONFIG_SERIAL_8250_LPC18XX) += 8250_lpc18xx.o
> obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o
> +obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o
> +
> +CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt
> + obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o
Fix looks good, thanks for this.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tty tree with the mips tree
@ 2015-06-09 10:59 Stephen Rothwell
2015-06-09 21:10 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2015-06-09 10:59 UTC (permalink / raw)
To: Greg KH, Ralf Baechle
Cc: linux-next, linux-kernel, Paul Burton, Masahiro Yamada
[-- Attachment #1: Type: text/plain, Size: 2104 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got conflicts in
drivers/tty/serial/8250/Kconfig and drivers/tty/serial/8250/Makefile
between commit d4a7bd1c0e5e ("serial: 8250_ingenic: support for Ingenic
SoC UARTs") from the mips tree and commit 1a8d2903cb6a ("serial:
8250_uniphier: add UniPhier serial 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 drivers/tty/serial/8250/Kconfig
index 43330ea95cfd,a74a8e4717d4..000000000000
--- a/drivers/tty/serial/8250/Kconfig
+++ b/drivers/tty/serial/8250/Kconfig
@@@ -343,11 -351,9 +351,18 @@@ config SERIAL_8250_MT657
If you have a Mediatek based board and want to use the
serial port, say Y to this option. If unsure, say N.
+config SERIAL_8250_INGENIC
+ bool "Support for Ingenic SoC serial ports"
+ depends on SERIAL_8250_CONSOLE && OF_FLATTREE
+ select LIBFDT
+ select SERIAL_EARLYCON
+ help
+ If you have a system using an Ingenic SoC and wish to make use of
+ its UARTs, say Y to this option. If unsure, say N.
++
+ config SERIAL_8250_UNIPHIER
+ tristate "Support for UniPhier on-chip UART"
+ depends on SERIAL_8250 && ARCH_UNIPHIER
+ help
+ If you have a UniPhier based board and want to use the on-chip
+ serial ports, say Y to this option. If unsure, say N.
diff --cc drivers/tty/serial/8250/Makefile
index 98fba26e194a,6fa22ffad63d..000000000000
--- a/drivers/tty/serial/8250/Makefile
+++ b/drivers/tty/serial/8250/Makefile
@@@ -22,7 -22,6 +22,9 @@@ obj-$(CONFIG_SERIAL_8250_DW) += 8250_d
obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o
obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o
obj-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
+ obj-$(CONFIG_SERIAL_8250_LPC18XX) += 8250_lpc18xx.o
obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o
+obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o
+
+CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt
+ obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the tty tree with the mips tree
2011-11-18 3:22 Stephen Rothwell
@ 2011-11-18 16:19 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2011-11-18 16:19 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Gabor Juhos, Ralf Baechle, Rong Wang
On Fri, Nov 18, 2011 at 02:22:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the tty tree got a conflict in
> drivers/tty/serial/Makefile between commit 58235d376b15 ("SERIAL: AR933X:
> Add driver for the built-in UART of the SoC") from the mips tree and
> commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
> drivers") from the tty tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks fine, thanks.
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the tty tree with the mips tree
@ 2011-11-18 3:22 Stephen Rothwell
2011-11-18 16:19 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-11-18 3:22 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Gabor Juhos, Ralf Baechle, Rong Wang
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/tty/serial/Makefile between commit 58235d376b15 ("SERIAL: AR933X:
Add driver for the built-in UART of the SoC") from the mips tree and
commit 161e773cbd0c ("UART: add CSR SiRFprimaII SoC on-chip uart
drivers") from the tty tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/tty/serial/Makefile
index 62f7d28,af57089..0000000
--- a/drivers/tty/serial/Makefile
+++ b/drivers/tty/serial/Makefile
@@@ -89,4 -94,4 +89,5 @@@ obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd
obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
obj-$(CONFIG_SERIAL_LANTIQ) += lantiq.o
obj-$(CONFIG_SERIAL_XILINX_PS_UART) += xilinx_uartps.o
+obj-$(CONFIG_SERIAL_AR933X) += ar933x_uart.o
+ obj-$(CONFIG_SERIAL_SIRFSOC) += sirfsoc_uart.o
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-05-02 15:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-02 5:52 linux-next: manual merge of the tty tree with the mips tree Stephen Rothwell
2016-05-02 15:28 ` 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
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).