Merge 6.7-rc5 into tty-next

We need the serial fixes in here as well to build off of.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/platform/surface/aggregator/core.c
index 72d7314,6152be3..9591a28
--- 1/drivers/platform/surface/aggregator/core.c
--- 2/drivers/platform/surface/aggregator/core.c
+++ b/drivers/platform/surface/aggregator/core.c
@@@ -227,13 -227,16 +227,16 @@@ EXPORT_SYMBOL_GPL(ssam_client_bind)
  
  /* -- Glue layer (serdev_device -> ssam_controller). ------------------------ */
  
 -static int ssam_receive_buf(struct serdev_device *dev, const unsigned char *buf,
 -                          size_t n)
 +static ssize_t ssam_receive_buf(struct serdev_device *dev, const u8 *buf,
 +                              size_t n)
  {
        struct ssam_controller *ctrl;
+       int ret;
  
        ctrl = serdev_device_get_drvdata(dev);
-       return ssam_controller_receive_buf(ctrl, buf, n);
+       ret = ssam_controller_receive_buf(ctrl, buf, n);
+ 
+       return ret < 0 ? 0 : ret;
  }
  
  static void ssam_write_wakeup(struct serdev_device *dev)

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

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

diff --cc drivers/tty/serial/amba-pl011.c
Simple merge

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

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