Merging debian version 6.7.7-1.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/debian/patches-rt/0096-printk-Disable-passing-console-lock-owner-completely.patch b/debian/patches-rt/0012-printk-Disable-passing-console-lock-owner-completely.patch
index d5dcdcdccc..adc25ac39d 100644
--- a/debian/patches-rt/0096-printk-Disable-passing-console-lock-owner-completely.patch
+++ b/debian/patches-rt/0012-printk-Disable-passing-console-lock-owner-completely.patch
@@ -1,8 +1,8 @@
 From: Petr Mladek <pmladek@suse.com>
 Date: Fri, 13 Oct 2023 14:12:05 +0000
-Subject: [PATCH 096/134] printk: Disable passing console lock owner completely
+Subject: [PATCH 12/50] printk: Disable passing console lock owner completely
  during panic()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
 
 The commit d51507098ff91 ("printk: disable optimistic spin
 during panic") added checks to avoid becoming a console waiter
@@ -58,7 +58,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
-@@ -1870,10 +1870,23 @@ static bool console_waiter;
+@@ -1869,10 +1869,23 @@ static bool console_waiter;
   */
  static void console_lock_spinning_enable(void)
  {
@@ -82,7 +82,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	/* The waiter may spin on us after setting console_owner */
  	spin_acquire(&console_owner_dep_map, 0, 0, _THIS_IP_);
  }
-@@ -1898,6 +1911,22 @@ static int console_lock_spinning_disable
+@@ -1897,6 +1910,22 @@ static int console_lock_spinning_disable
  {
  	int waiter;