Merge 4.19-rc6 into tty-next

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

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/tty/serial/cpm_uart/cpm_uart_core.c
Simple merge

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