Merge 4.15-rc3 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2017 07:41:08 +0000 (08:41 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Dec 2017 07:41:08 +0000 (08:41 +0100)
commit42e64571d516ef761d9f330c80493637cbf3bdda
tree5f3df1c06c2d571efa5fd72d0c8022a80140eec2
parentb8f3bff057b017309fbd61fe74712b1f185b5399
parent50c4c4e268a2d7a3e58ebb698ac74da0de40ae36
Merge 4.15-rc3 into tty-next

We want the serial/tty fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serdev/serdev-ttyport.c
include/linux/serdev.h