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

2016-05-20 Thread Greg KH
On Fri, May 20, 2016 at 12:31:51PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > include/uapi/linux/serial_core.h > > between commits: > > 157b9394709e ("serial: pic32_uart: Add PIC32 UART driver") > 07b75260ebc2 ("Merge bran

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

2014-05-05 Thread Greg KH
On Mon, May 05, 2014 at 03:41:03PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > arch/arm64/kernel/early_printk.c between commit f774b7d10e21 ("arm64: > fixmap: fix missing sub-page offset for earlyprintk") from the tree and > commit 8e

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

2013-01-25 Thread Greg KH
On Mon, Jan 21, 2013 at 02:46:04PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty: > serial: vt8500: fix return value check in vt8500_serial_probe()") from > Linus' tree

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

2013-01-21 Thread Greg KH
On Mon, Jan 21, 2013 at 02:46:04PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/serial/vt8500_serial.c between commit a6dd114e16cb ("tty: > serial: vt8500: fix return value check in vt8500_serial_probe()") from > Linus' tree

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

2013-01-17 Thread Greg KH
On Thu, Jan 17, 2013 at 01:04:23PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/staging/sb105x/Kconfig between commit db210312f77b ("staging: > Make SystemBase PCI Multiport UART only for x86") from the tree and > commit e27a7d