Merge 5.0-rc4 into tty-next

We need the tty and serial fixes in here as well.

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

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

diff --cc drivers/tty/serial/qcom_geni_serial.c
index b650a3a0ab7da2eababf7fe1dd510a86ae34658f,38016609c7fa99b1726bcebe3ed04b1fd6a0c724..3bcec1c20219102b277aafc72b548425df33e175
--- 1/drivers/tty/serial/qcom_geni_serial.c
--- 2/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -221,10 -225,10 +221,10 @@@ static unsigned int qcom_geni_serial_ge
        unsigned int mctrl = TIOCM_DSR | TIOCM_CAR;
        u32 geni_ios;
  
-       if (uart_console(uport) || !uart_cts_enabled(uport)) {
+       if (uart_console(uport)) {
                mctrl |= TIOCM_CTS;
        } else {
 -              geni_ios = readl_relaxed(uport->membase + SE_GENI_IOS);
 +              geni_ios = readl(uport->membase + SE_GENI_IOS);
                if (!(geni_ios & IO2_DATA_IN))
                        mctrl |= TIOCM_CTS;
        }

diff --cc drivers/tty/vt/vt.c
Simple merge