Merging debian version 6.7.7-1.

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

1 files changed, 0 insertions, 67 deletions

diff --git a/debian/patches-rt/0107-printk-Add-flags-argument-for-console_is_usable.patch b/debian/patches-rt/0107-printk-Add-flags-argument-for-console_is_usable.patch
deleted file mode 100644
index e8c4b4a739..0000000000
--- a/debian/patches-rt/0107-printk-Add-flags-argument-for-console_is_usable.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: John Ogness <john.ogness@linutronix.de>
-Date: Tue, 12 Sep 2023 13:45:33 +0000
-Subject: [PATCH 107/134] printk: Add @flags argument for console_is_usable()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.6/older/patches-6.6.7-rt18.tar.xz
-
-The caller of console_is_usable() usually needs @console->flags
-for its own checks. Rather than having console_is_usable() read
-its own copy, make the caller pass in the @flags. This also
-ensures that the caller saw the same @flags value.
-
-Signed-off-by: John Ogness <john.ogness@linutronix.de>
-Reviewed-by: Petr Mladek <pmladek@suse.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- kernel/printk/internal.h |    8 ++------
- kernel/printk/printk.c   |    5 +++--
- 2 files changed, 5 insertions(+), 8 deletions(-)
-
---- a/kernel/printk/internal.h
-+++ b/kernel/printk/internal.h
-@@ -83,13 +83,9 @@ void nbcon_free(struct console *con);
-  * records. Note that this function does not consider the current context,
-  * which can also play a role in deciding if @con can be used to print
-  * records.
-- *
-- * Requires the console_srcu_read_lock.
-  */
--static inline bool console_is_usable(struct console *con)
-+static inline bool console_is_usable(struct console *con, short flags)
- {
--	short flags = console_srcu_read_flags(con);
--
- 	if (!(flags & CON_ENABLED))
- 		return false;
- 
-@@ -136,7 +132,7 @@ static inline bool nbcon_alloc(struct co
- static inline void nbcon_init(struct console *con) { }
- static inline void nbcon_free(struct console *con) { }
- 
--static inline bool console_is_usable(struct console *con) { return false; }
-+static inline bool console_is_usable(struct console *con, short flags) { return false; }
- 
- #endif /* CONFIG_PRINTK */
- 
---- a/kernel/printk/printk.c
-+++ b/kernel/printk/printk.c
-@@ -2940,9 +2940,10 @@ static bool console_flush_all(bool do_co
- 
- 		cookie = console_srcu_read_lock();
- 		for_each_console_srcu(con) {
-+			short flags = console_srcu_read_flags(con);
- 			bool progress;
- 
--			if (!console_is_usable(con))
-+			if (!console_is_usable(con, flags))
- 				continue;
- 			any_usable = true;
- 
-@@ -3784,7 +3785,7 @@ static bool __pr_flush(struct console *c
- 			 * that they make forward progress, so only increment
- 			 * @diff for usable consoles.
- 			 */
--			if (!console_is_usable(c))
-+			if (!console_is_usable(c, flags))
- 				continue;
- 
- 			if (flags & CON_NBCON) {