]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Merge 6.17-rc6 into tty-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2025 06:27:31 +0000 (08:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Sep 2025 06:27:31 +0000 (08:27 +0200)
We need the tty/serial fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/tty/hvc/hvc_console.c
drivers/tty/serial/8250/8250_rsa.c
drivers/tty/serial/sc16is7xx.c

Simple merge
index ff52ad02f6be6f305a105079fd432b98553a3317,12a65b79583c03e73bd8f3439b8b541c027f242f..40a3dbd9e452ca8212d38bd6d2e92a3d3a7b3815
@@@ -177,8 -177,9 +177,8 @@@ void rsa_disable(struct uart_8250_port 
  
        if (result)
                up->port.uartclk = SERIAL_RSA_BAUD_BASE_LO * 16;
 -      uart_port_unlock_irq(&up->port);
  }
- EXPORT_SYMBOL_GPL_FOR_MODULES(rsa_disable, "8250_base");
+ EXPORT_SYMBOL_FOR_MODULES(rsa_disable, "8250_base");
  
  void rsa_autoconfig(struct uart_8250_port *up)
  {
Simple merge