Merging debian version 5.10.216-1.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/debian/patches-rt/0103-printk-change-console_seq-to-atomic64_t.patch b/debian/patches-rt/0103-printk-change-console_seq-to-atomic64_t.patch
index 6647ecd6c..a7f3249aa 100644
--- a/debian/patches-rt/0103-printk-change-console_seq-to-atomic64_t.patch
+++ b/debian/patches-rt/0103-printk-change-console_seq-to-atomic64_t.patch
@@ -1,8 +1,8 @@
-From ebdec06c58c4330925d5603649542827bf7bff25 Mon Sep 17 00:00:00 2001
+From 7b6f9a34e7c1a5c1ffdffcd59b9efdcb465a6e4f Mon Sep 17 00:00:00 2001
 From: John Ogness <john.ogness@linutronix.de>
 Date: Mon, 30 Nov 2020 01:42:05 +0106
 Subject: [PATCH 103/323] printk: change @console_seq to atomic64_t
-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
 
 In preparation for atomic printing, change @console_seq to atomic
 so that it can be accessed without requiring @console_sem.
@@ -14,7 +14,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  1 file changed, 19 insertions(+), 15 deletions(-)
 
 diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
-index 0ae184675e86..2bc9904fd8ab 100644
+index d7f17b8253cdc..818c17b26bdee 100644
 --- a/kernel/printk/printk.c
 +++ b/kernel/printk/printk.c
 @@ -368,12 +368,13 @@ static u64 syslog_seq;
@@ -34,7 +34,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  struct latched_seq {
  	seqcount_latch_t	latch;
  	u64			val[2];
-@@ -2273,7 +2274,7 @@ EXPORT_SYMBOL(printk);
+@@ -2279,7 +2280,7 @@ EXPORT_SYMBOL(printk);
  #define prb_first_valid_seq(rb)		0
  
  static u64 syslog_seq;
@@ -43,7 +43,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  static u64 exclusive_console_stop_seq;
  static unsigned long console_dropped;
  
-@@ -2588,6 +2589,7 @@ void console_unlock(void)
+@@ -2594,6 +2595,7 @@ void console_unlock(void)
  	bool do_cond_resched, retry;
  	struct printk_info info;
  	struct printk_record r;
@@ -51,7 +51,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  
  	if (console_suspended) {
  		up_console_sem();
-@@ -2630,12 +2632,14 @@ void console_unlock(void)
+@@ -2636,12 +2638,14 @@ void console_unlock(void)
  		size_t len;
  
  skip:
@@ -70,7 +70,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  		}
  
  		if (suppress_message_printing(r.info->level)) {
-@@ -2644,13 +2648,13 @@ void console_unlock(void)
+@@ -2650,13 +2654,13 @@ void console_unlock(void)
  			 * directly to the console when we received it, and
  			 * record that has level above the console loglevel.
  			 */
@@ -86,7 +86,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  			exclusive_console = NULL;
  		}
  
-@@ -2671,7 +2675,7 @@ void console_unlock(void)
+@@ -2677,7 +2681,7 @@ void console_unlock(void)
  		len = record_print_text(&r,
  				console_msg_format & MSG_FORMAT_SYSLOG,
  				printk_time);
@@ -95,7 +95,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  
  		/*
  		 * While actively printing out messages, if another printk()
-@@ -2702,7 +2706,7 @@ void console_unlock(void)
+@@ -2708,7 +2712,7 @@ void console_unlock(void)
  	 * there's a new owner and the console_unlock() from them will do the
  	 * flush, no worries.
  	 */
@@ -104,7 +104,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  	if (retry && console_trylock())
  		goto again;
  }
-@@ -2765,7 +2769,7 @@ void console_flush_on_panic(enum con_flush_mode mode)
+@@ -2771,7 +2775,7 @@ void console_flush_on_panic(enum con_flush_mode mode)
  	console_may_schedule = 0;
  
  	if (mode == CONSOLE_REPLAY_ALL)
@@ -113,7 +113,7 @@ index 0ae184675e86..2bc9904fd8ab 100644
  	console_unlock();
  }
  
-@@ -3002,11 +3006,11 @@ void register_console(struct console *newcon)
+@@ -3031,11 +3035,11 @@ void register_console(struct console *newcon)
  		 * ignores console_lock.
  		 */
  		exclusive_console = newcon;
@@ -128,5 +128,5 @@ index 0ae184675e86..2bc9904fd8ab 100644
  	}
  	console_unlock();
 -- 
-2.43.0
+2.44.0