Merge 4.12-rc3 into tty-next

We need the tty fixes/changes here to handle future work.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

diff --cc drivers/tty/serial/8250/8250_port.c
Simple merge

diff --cc drivers/tty/serial/imx.c
Simple merge