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>

diff --cc drivers/tty/serdev/serdev-ttyport.c
Simple merge

diff --cc include/linux/serdev.h
Simple merge