Merge 6.6-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Oct 2023 08:18:49 +0000 (10:18 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Oct 2023 08:18:49 +0000 (10:18 +0200)
commitfe2017ba24f318e5feef487b7552e40a3de2d50a
tree59f3695ecd07645910210156fc8255da99aba6f7
parentdd976a97d15b47656991e185a94ef42a0fa5cfd4
parent58720809f52779dc0f08e53e54b014209d13eebb
Merge 6.6-rc6 into tty-next

We need the tty/serial fixes in here as well for testing, and this
resolves merge conflicts in:
drivers/tty/serial/serial_core.c
as reported in linux-next

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_omap.c
drivers/tty/serial/serial_core.c