Merging debian version 4.19.260-1.

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

1 files changed, 0 insertions, 41 deletions

diff --git a/debian/patches-rt/0297-posix-timers-Unlock-expiry-lock-in-the-early-return.patch b/debian/patches-rt/0297-posix-timers-Unlock-expiry-lock-in-the-early-return.patch
deleted file mode 100644
index 001c07c9c..000000000
--- a/debian/patches-rt/0297-posix-timers-Unlock-expiry-lock-in-the-early-return.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 89d528d5fab49f30a5cbd2ef13e19d488a6e21ae Mon Sep 17 00:00:00 2001
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Mon, 16 Sep 2019 12:33:59 +0200
-Subject: [PATCH 297/347] posix-timers: Unlock expiry lock in the early return
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
-
-[ Upstream commit 356a2781375ec58521a9bc3f500488745990c242 ]
-
-Patch ("posix-timers: Add expiry lock") acquired a lock in
-run_posix_cpu_timers() but didn't drop the lock in the early return.
-
-Unlock the lock in the early return path.
-
-Reported-by: kbuild test robot <lkp@intel.com>
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
----
- kernel/time/posix-cpu-timers.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
-index 54632ed51c65..b9e4ccbb60f3 100644
---- a/kernel/time/posix-cpu-timers.c
-+++ b/kernel/time/posix-cpu-timers.c
-@@ -1175,8 +1175,10 @@ static void __run_posix_cpu_timers(struct task_struct *tsk)
- 	expiry_lock = this_cpu_ptr(&cpu_timer_expiry_lock);
- 	spin_lock(expiry_lock);
- 
--	if (!lock_task_sighand(tsk, &flags))
-+	if (!lock_task_sighand(tsk, &flags)) {
-+		spin_unlock(expiry_lock);
- 		return;
-+	}
- 	/*
- 	 * Here we take off tsk->signal->cpu_timers[N] and
- 	 * tsk->cpu_timers[N] all the timers that are firing, and
--- 
-2.36.1
-