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

2017-05-07 Thread Greg KH
On Thu, Apr 13, 2017 at 01:36:31PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in: > > include/linux/serdev.h > > between commits: > > b3f80c8f75ef ("serdev: add serdev_device_wait_until_sent") > 5659dab26f09 ("serdev: implement ge

linux-next: manual merge of the tty tree with the bluetooth tree

2017-04-12 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the tty tree got a conflict in: include/linux/serdev.h between commits: b3f80c8f75ef ("serdev: add serdev_device_wait_until_sent") 5659dab26f09 ("serdev: implement get/set tiocm") from the bluetooth tree and commit: 6fe729c4bdae ("serdev: Add serde