Merging debian version 6.10.3-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 29 insertions, 0 deletions

diff --git a/debian/patches-rt/0048-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch b/debian/patches-rt/0048-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch
new file mode 100644
index 0000000000..3a02162768
--- /dev/null
+++ b/debian/patches-rt/0048-serial-8250-Revert-drop-lockdep-annotation-from-seri.patch
@@ -0,0 +1,29 @@
+From: John Ogness <john.ogness@linutronix.de>
+Date: Mon, 2 Oct 2023 15:30:43 +0000
+Subject: [PATCH 48/48] serial: 8250: Revert "drop lockdep annotation from
+ serial8250_clear_IER()"
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz
+
+The 8250 driver no longer depends on @oops_in_progress and
+will no longer violate the port->lock locking constraints.
+
+This reverts commit 3d9e6f556e235ddcdc9f73600fdd46fe1736b090.
+
+Signed-off-by: John Ogness <john.ogness@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/tty/serial/8250/8250_port.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/tty/serial/8250/8250_port.c
++++ b/drivers/tty/serial/8250/8250_port.c
+@@ -712,6 +712,9 @@ static void __serial8250_clear_IER(struc
+ 
+ static inline void serial8250_clear_IER(struct uart_8250_port *up)
+ {
++	/* Port locked to synchronize UART_IER access against the console. */
++	lockdep_assert_held_once(&up->port.lock);
++
+ 	__serial8250_clear_IER(up);
+ }
+