Re: linux-next: manual merge of the tty tree with the mips tree

2016-05-02 Thread Greg KH
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"

Re: linux-next: manual merge of the tty tree with the mips tree

2015-06-09 Thread Greg KH
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")