Merge branch 'v5.10-rt' into 5.10-rt

xanmod · May 8, 2021 · efb1abe · efb1abe
2 parents d466a19 + a2847d5
commit efb1abe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
@@ -73,7 +73,7 @@ struct netns_xfrm {
 	struct dst_ops		xfrm6_dst_ops;
 #endif
 	spinlock_t		xfrm_state_lock;
-	seqcount_t		xfrm_state_hash_generation;
+	seqcount_spinlock_t	xfrm_state_hash_generation;
 
 	spinlock_t xfrm_policy_lock;
 	struct mutex xfrm_cfg_mutex;

diff --git a/localversion-rt b/localversion-rt
@@ -1 +1 @@
--rt37
+-rt38