[rt] Rebase seqlock patches on top of 5.9.6

The patch "seqlock: Unbreak lockdep" was applied in 5.9.2, causing
conflicts with some other seqlock patches that are before it in the
current rt patch series.

There is also a minor conflict with "time/sched_clock: Mark
sched_clock_read_begin/retry() as notrace" applied in 5.9.5.

* Drop "seqlock: Unbreak lockdep" from the rt patch series
* Resolve the remaining conflicts with seqlock patches
* Re-enable all the other seqlock patches

Also resolve a trivial textual conflict with "time/sched_clock: Mark
sched_clock_read_begin/retry() as notrace" in 5.9.5.

1 files changed, 16 insertions, 18 deletions

diff --git a/debian/patches-rt/series b/debian/patches-rt/series
index 2bd4c08f4..8d8aa8923 100644
--- a/debian/patches-rt/series
+++ b/debian/patches-rt/series
@@ -179,34 +179,32 @@ mm-memcontrol-Disable-preemption-in-__mod_memcg_lruv.patch
 
 # seqcount
 # https://lkml.kernel.org/r/20200817000200.20993-1-rdunlap@infradead.org
-#seqlock-Fix-multiple-kernel-doc-warnings.patch
+seqlock-Fix-multiple-kernel-doc-warnings.patch
 # 2020-08-27 13:40 Ahmed S. Darwis [PATCH v1 0/8] seqlock: Introduce seqcount_latch_t
 # 20200827114044.11173-1-a.darwish@linutronix.de
-#0001-time-sched_clock-Use-raw_read_seqcount_latch-during-.patch
-#0002-mm-swap-Do-not-abuse-the-seqcount_t-latching-API.patch
-#0003-seqlock-Introduce-seqcount_latch_t.patch
-#0004-time-sched_clock-Use-seqcount_latch_t.patch
-#0005-timekeeping-Use-seqcount_latch_t.patch
-#0006-x86-tsc-Use-seqcount_latch_t.patch
-#0007-rbtree_latch-Use-seqcount_latch_t.patch
-#0008-seqlock-seqcount-latch-APIs-Only-allow-seqcount_latc.patch
+0001-time-sched_clock-Use-raw_read_seqcount_latch-during-.patch
+0002-mm-swap-Do-not-abuse-the-seqcount_t-latching-API.patch
+0003-seqlock-Introduce-seqcount_latch_t.patch
+0004-time-sched_clock-Use-seqcount_latch_t.patch
+0005-timekeeping-Use-seqcount_latch_t.patch
+0006-x86-tsc-Use-seqcount_latch_t.patch
+0007-rbtree_latch-Use-seqcount_latch_t.patch
+0008-seqlock-seqcount-latch-APIs-Only-allow-seqcount_latc.patch
 # 2020-09-04 17:32 Ahmed S. Darwis [PATCH v2 0/5] seqlock: Introduce PREEMPT_RT support
 # 20200904153231.11994-1-a.darwish@linutronix.de
-#0009-seqlock-seqcount_LOCKNAME_t-Standardize-naming-conve.patch
-#0010-seqlock-Use-unique-prefix-for-seqcount_t-property-ac.patch
-#0011-seqlock-seqcount_t-Implement-all-read-APIs-as-statem.patch
-#0012-seqlock-seqcount_LOCKNAME_t-Introduce-PREEMPT_RT-sup.patch
-#0013-seqlock-PREEMPT_RT-Do-not-starve-seqlock_t-writers.patch
-## 267580db047ef428a70bef8287ca62c5a450c139
-#seqlock-Unbreak-lockdep.patch
+0009-seqlock-seqcount_LOCKNAME_t-Standardize-naming-conve.patch
+0010-seqlock-Use-unique-prefix-for-seqcount_t-property-ac.patch
+0011-seqlock-seqcount_t-Implement-all-read-APIs-as-statem.patch
+0012-seqlock-seqcount_LOCKNAME_t-Introduce-PREEMPT_RT-sup.patch
+0013-seqlock-PREEMPT_RT-Do-not-starve-seqlock_t-writers.patch
 ##
 0024-xfrm-Use-sequence-counter-with-associated-spinlock.patch
 u64_stats-Disable-preemption-on-32bit-UP-SMP-with-RT.patch
 
 fs-dcache-use-swait_queue-instead-of-waitqueue.patch
 fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch
-#net-Qdisc-use-a-seqlock-instead-seqcount.patch
-#net-Properly-annotate-the-try-lock-for-the-seqlock.patch
+net-Qdisc-use-a-seqlock-instead-seqcount.patch
+net-Properly-annotate-the-try-lock-for-the-seqlock.patch
 #####
 
 # split changelog