Merging debian version 4.19.260-1.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch b/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
index d93342369..1f6332c5b 100644
--- a/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
+++ b/debian/patches-rt/0103-hrtimer-move-state-change-before-hrtimer_cancel-in-d.patch
@@ -1,9 +1,8 @@
-From baa58a4f1714630ef1a780575a907b4f80344e19 Mon Sep 17 00:00:00 2001
 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 Date: Thu, 6 Dec 2018 10:15:13 +0100
-Subject: [PATCH 103/347] hrtimer: move state change before hrtimer_cancel in
+Subject: [PATCH 103/342] hrtimer: move state change before hrtimer_cancel in
  do_nanosleep()
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=caa78d03cd12d437e13c46990f9bbf0d5e4213a2
 
 There is a small window between setting t->task to NULL and waking the
 task up (which would set TASK_RUNNING). So the timer would fire, run and
@@ -46,6 +45,3 @@ index 0833e5cf224d..009001f06d33 100644
  
  	if (!t->task)
  		return 0;
--- 
-2.36.1
-