Merge 6.1-rc6 into tty-next

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

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

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

diff --cc drivers/tty/serial/8250/8250_omap.c
index 7bb9da7,3f33014..734f092
--- 1/drivers/tty/serial/8250/8250_omap.c
--- 2/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@@ -348,12 -344,9 +351,12 @@@ static void omap8250_restore_regs(struc
  
        omap8250_update_mdr1(up, priv);
  
-       up->port.ops->set_mctrl(&up->port, up->port.mctrl);
+       __omap8250_set_mctrl(&up->port, up->port.mctrl);
  
 -      if (up->port.rs485.flags & SER_RS485_ENABLED)
 +      serial_out(up, UART_OMAP_MDR3, priv->mdr3);
 +
 +      if (up->port.rs485.flags & SER_RS485_ENABLED &&
 +          up->port.rs485_config == serial8250_em485_config)
                serial8250_em485_stop_tx(up);
  }
  

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

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

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