Merge 6.2-rc5 into tty-next

We need the serial/tty changes into this branch as well.

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

diff --cc drivers/tty/serial/qcom_geni_serial.c
index c1aea9d,57f04f8..d98e0a8
--- 1/drivers/tty/serial/qcom_geni_serial.c
--- 2/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -1758,21 -1594,13 +1772,23 @@@ static int qcom_geni_serial_sys_hib_res
        return ret;
  }
  
 +static const struct qcom_geni_device_data qcom_geni_console_data = {
 +      .console = true,
 +      .mode = GENI_SE_FIFO,
 +};
 +
 +static const struct qcom_geni_device_data qcom_geni_uart_data = {
 +      .console = false,
 +      .mode = GENI_SE_DMA,
 +};
 +
  static const struct dev_pm_ops qcom_geni_serial_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend,
-                                       qcom_geni_serial_sys_resume)
-       .restore = qcom_geni_serial_sys_hib_resume,
-       .thaw = qcom_geni_serial_sys_hib_resume,
+       .suspend = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+       .resume = pm_sleep_ptr(qcom_geni_serial_sys_resume),
+       .freeze = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+       .poweroff = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+       .restore = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
+       .thaw = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
  };
  
  static const struct of_device_id qcom_geni_serial_match_table[] = {

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