Merge 5.18-rc7 into usb-next

We need the tty fixes in here as well, as we need to revert one of them :(

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/tty/serial/fsl_lpuart.c
index 75b3c36c13bcf8aff9d45466bff9e1c7acc7e89f,be12fee94db55a8ee1db85836da3f576a5818b7d..7b46b97a6ddd80e1cd42c18386693f884f3088b6
--- 1/drivers/tty/serial/fsl_lpuart.c
--- 2/drivers/tty/serial/fsl_lpuart.c
+++ b/drivers/tty/serial/fsl_lpuart.c
@@@ -2739,8 -2780,11 +2740,7 @@@ failed_get_rs485
  failed_reset:
        uart_remove_one_port(&lpuart_reg, &sport->port);
  failed_attach_port:
- failed_irq_request:
        lpuart_disable_clks(sport);
 -failed_clock_enable:
 -failed_out_of_range:
 -      if (sport->id_allocated)
 -              ida_simple_remove(&fsl_lpuart_ida, sport->port.line);
        return ret;
  }