Merge tag 'v5.19-rc3' 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/serial/8250/8250_port.c
index 953b0fadfd4c46eba0652f440fe69f13bfc8da11,8f32fe9e149e913081d49758f168feb79c87323f..3e3d784aa628f8ce88b31a463cfd7bc1368c1a6c
--- 1/drivers/tty/serial/8250/8250_port.c
--- 2/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@@ -1502,9 -1514,11 +1502,11 @@@ static inline void __stop_tx(struct uar
        struct uart_8250_em485 *em485 = p->em485;
  
        if (em485) {
 -              unsigned char lsr = serial_in(p, UART_LSR);
 +              unsigned char lsr = serial_lsr_in(p);
                u64 stop_delay = 0;
  
+               p->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+ 
                if (!(lsr & UART_LSR_THRE))
                        return;
                /*

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

diff --cc include/linux/serial_core.h
Simple merge