Merging debian version 6.10.3-1.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch b/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch
index 07220890af..c8f9a2f9a2 100644
--- a/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch
+++ b/debian/patches-rt/0023-printk-Track-nbcon-consoles.patch
@@ -1,7 +1,7 @@
 From: John Ogness <john.ogness@linutronix.de>
 Date: Mon, 11 Dec 2023 09:36:52 +0000
-Subject: [PATCH 23/46] printk: Track nbcon consoles
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.9/older/patches-6.9-rt5.tar.xz
+Subject: [PATCH 23/48] printk: Track nbcon consoles
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.10/older/patches-6.10.2-rt14.tar.xz
 
 Add a global flag @have_nbcon_console to identify if any nbcon
 consoles are registered. This will be used in follow-up commits
@@ -28,7 +28,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
   * Specifies if a boot console is registered. If boot consoles are present,
   * nbcon consoles cannot print simultaneously and must be synchronized by
   * the console lock. This is because boot consoles and nbcon consoles may
-@@ -3552,6 +3557,7 @@ void register_console(struct console *ne
+@@ -3565,6 +3570,7 @@ void register_console(struct console *ne
  	init_seq = get_init_console_seq(newcon, bootcon_registered);
  
  	if (newcon->flags & CON_NBCON) {
@@ -36,15 +36,15 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  		nbcon_init(newcon, init_seq);
  	} else {
  		have_legacy_console = true;
-@@ -3631,6 +3637,7 @@ EXPORT_SYMBOL(register_console);
- static int unregister_console_locked(struct console *console)
+@@ -3645,6 +3651,7 @@ static int unregister_console_locked(str
  {
+ 	bool use_device_lock = (console->flags & CON_NBCON) && console->write_atomic;
  	bool found_legacy_con = false;
 +	bool found_nbcon_con = false;
  	bool found_boot_con = false;
  	unsigned long flags;
  	struct console *c;
-@@ -3698,13 +3705,18 @@ static int unregister_console_locked(str
+@@ -3712,13 +3719,18 @@ static int unregister_console_locked(str
  	for_each_console(c) {
  		if (c->flags & CON_BOOT)
  			found_boot_con = true;