Merging debian version 5.10.216-1.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/debian/patches-rt/0101-printk-relocate-printk_delay-and-vprintk_default.patch b/debian/patches-rt/0101-printk-relocate-printk_delay-and-vprintk_default.patch
index 27a3bd9d4..14997bd74 100644
--- a/debian/patches-rt/0101-printk-relocate-printk_delay-and-vprintk_default.patch
+++ b/debian/patches-rt/0101-printk-relocate-printk_delay-and-vprintk_default.patch
@@ -1,8 +1,8 @@
-From 598543b96b715ed360718ca3597ad4a2eda53241 Mon Sep 17 00:00:00 2001
+From 84c0677048de1c7ddfdb10426f86485e8475f769 Mon Sep 17 00:00:00 2001
 From: John Ogness <john.ogness@linutronix.de>
 Date: Mon, 30 Nov 2020 01:42:03 +0106
 Subject: [PATCH 101/323] printk: relocate printk_delay() and vprintk_default()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz
 
 Move printk_delay() and vprintk_default() "as is" further up so that
 they can be used by new functions in an upcoming commit.
@@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  1 file changed, 20 insertions(+), 20 deletions(-)
 
 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 8768473712b2..c3fc6706a118 100644
+index c32af4f006093..b25a17947ae90 100644
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
 @@ -1728,6 +1728,20 @@ SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
@@ -38,7 +38,7 @@ index 8768473712b2..c3fc6706a118 100644
  /*
   * Special console_lock variants that help to reduce the risk of soft-lockups.
   * They allow to pass console_lock to another printk() call using a busy wait.
-@@ -1971,20 +1985,6 @@ static void printk_exit_irqrestore(unsigned long flags)
+@@ -1977,20 +1991,6 @@ static void printk_exit_irqrestore(unsigned long flags)
  	local_irq_restore(flags);
  }
  
@@ -59,7 +59,7 @@ index 8768473712b2..c3fc6706a118 100644
  static inline u32 printk_caller_id(void)
  {
  	return in_task() ? task_pid_nr(current) :
-@@ -2217,18 +2217,18 @@ asmlinkage int vprintk_emit(int facility, int level,
+@@ -2223,18 +2223,18 @@ asmlinkage int vprintk_emit(int facility, int level,
  }
  EXPORT_SYMBOL(vprintk_emit);
  
@@ -85,5 +85,5 @@ index 8768473712b2..c3fc6706a118 100644
   * printk - print a kernel message
   * @fmt: format string
 -- 
-2.43.0
+2.44.0