Merging debian version 6.8.9-1.

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

1 files changed, 11 insertions, 11 deletions

diff --git a/debian/patches-rt/0041-printk-nbcon-Stop-threads-on-shutdown-reboot.patch b/debian/patches-rt/0037-printk-nbcon-Stop-threads-on-shutdown-reboot.patch
index f412a9adf0..28fccd7fc7 100644
--- a/debian/patches-rt/0041-printk-nbcon-Stop-threads-on-shutdown-reboot.patch
+++ b/debian/patches-rt/0037-printk-nbcon-Stop-threads-on-shutdown-reboot.patch
@@ -1,7 +1,7 @@
 From: John Ogness <john.ogness@linutronix.de>
 Date: Tue, 26 Sep 2023 13:04:15 +0000
-Subject: [PATCH 41/50] printk: nbcon: Stop threads on shutdown/reboot
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.7/older/patches-6.7-rt6.tar.xz
+Subject: [PATCH 37/48] printk: nbcon: Stop threads on shutdown/reboot
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.8/older/patches-6.8.2-rt11.tar.xz
 
 Register a syscore_ops shutdown function to stop all threaded
 printers on shutdown/reboot. This allows printk to transition back
@@ -16,18 +16,18 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 
 --- a/kernel/printk/nbcon.c
 +++ b/kernel/printk/nbcon.c
-@@ -8,6 +8,7 @@
- #include <linux/kthread.h>
- #include <linux/slab.h>
- #include <linux/serial_core.h>
+@@ -18,6 +18,7 @@
+ #include <linux/smp.h>
+ #include <linux/stddef.h>
+ #include <linux/string.h>
 +#include <linux/syscore_ops.h>
- #include "printk_ringbuffer.h"
+ #include <linux/types.h>
  #include "internal.h"
- /*
-@@ -1577,3 +1578,33 @@ void nbcon_release(struct uart_port *up)
- 	con->locked_port = false;
+ #include "printk_ringbuffer.h"
+@@ -1577,3 +1578,33 @@ void nbcon_driver_release(struct console
+ 		nbcon_context_release(ctxt);
  }
- EXPORT_SYMBOL_GPL(nbcon_release);
+ EXPORT_SYMBOL_GPL(nbcon_driver_release);
 +
 +/**
 + * printk_kthread_shutdown - shutdown all threaded printers