[ANNOUNCE] v5.15-rc3-rt5v5.15-rc3-rt5-patches

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

4 files changed, 1 insertions, 81 deletions

diff --git a/patches/Add_localversion_for_-RT_release.patch b/patches/Add_localversion_for_-RT_release.patch
index 41fc0b58e69e..f2d35e0c0528 100644
--- a/patches/Add_localversion_for_-RT_release.patch
+++ b/patches/Add_localversion_for_-RT_release.patch
@@ -15,4 +15,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 --- /dev/null
 +++ b/localversion-rt
 @@ -0,0 +1 @@
-+-rt4
++-rt5
diff --git a/patches/mm-Fully-initialize-invalidate_lock-amend-lock-class.patch b/patches/mm-Fully-initialize-invalidate_lock-amend-lock-class.patch
deleted file mode 100644
index 278a5a4a9b81..000000000000
--- a/patches/mm-Fully-initialize-invalidate_lock-amend-lock-class.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Tue, 31 Aug 2021 20:48:02 +0200
-Subject: [PATCH] mm: Fully initialize invalidate_lock, amend lock class later
-
-The function __init_rwsem() is not part of the official API, it just a helper
-function used by init_rwsem().
-Changing the lock's class and name should be done by using
-lockdep_set_class_and_name() after the has been fully initialized. The overhead
-of the additional class struct and setting it twice is negligible and it works
-across all locks.
-
-Fully initialize the lock with init_rwsem() and then set the custom class and
-name for the lock.
-
-Fixes: 730633f0b7f95 ("mm: Protect operations adding pages to page cache with invalidate_lock")
-Link: https://lkml.kernel.org/r/20210901084403.g4fezi23cixemlhh@linutronix.de
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- fs/inode.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/fs/inode.c
-+++ b/fs/inode.c
-@@ -190,8 +190,10 @@ int inode_init_always(struct super_block
- 	mapping_set_gfp_mask(mapping, GFP_HIGHUSER_MOVABLE);
- 	mapping->private_data = NULL;
- 	mapping->writeback_index = 0;
--	__init_rwsem(&mapping->invalidate_lock, "mapping.invalidate_lock",
--		     &sb->s_type->invalidate_lock_key);
-+	init_rwsem(&mapping->invalidate_lock);
-+	lockdep_set_class_and_name(&mapping->invalidate_lock,
-+				   &sb->s_type->invalidate_lock_key,
-+				   "mapping.invalidate_lock");
- 	inode->i_private = NULL;
- 	inode->i_mapping = mapping;
- 	INIT_HLIST_HEAD(&inode->i_dentry);	/* buggered by rcu freeing */
diff --git a/patches/net__Move_lockdep_where_it_belongs.patch b/patches/net__Move_lockdep_where_it_belongs.patch
deleted file mode 100644
index 4d353b6db363..000000000000
--- a/patches/net__Move_lockdep_where_it_belongs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: net: Move lockdep where it belongs
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Tue Sep  8 07:32:20 2020 +0200
-
-From: Thomas Gleixner <tglx@linutronix.de>
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
----
- net/core/sock.c |    6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
----
---- a/net/core/sock.c
-+++ b/net/core/sock.c
-@@ -3184,12 +3184,11 @@ void lock_sock_nested(struct sock *sk, i
- 	if (sk->sk_lock.owned)
- 		__lock_sock(sk);
- 	sk->sk_lock.owned = 1;
--	spin_unlock(&sk->sk_lock.slock);
-+	spin_unlock_bh(&sk->sk_lock.slock);
- 	/*
- 	 * The sk_lock has mutex_lock() semantics here:
- 	 */
- 	mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
--	local_bh_enable();
- }
- EXPORT_SYMBOL(lock_sock_nested);
- 
-@@ -3238,13 +3237,12 @@ bool lock_sock_fast(struct sock *sk) __a
- 
- 	__lock_sock(sk);
- 	sk->sk_lock.owned = 1;
--	spin_unlock(&sk->sk_lock.slock);
-+	spin_unlock_bh(&sk->sk_lock.slock);
- 	/*
- 	 * The sk_lock has mutex_lock() semantics here:
- 	 */
- 	mutex_acquire(&sk->sk_lock.dep_map, 0, 0, _RET_IP_);
- 	__acquire(&sk->sk_lock.slock);
--	local_bh_enable();
- 	return true;
- }
- EXPORT_SYMBOL(lock_sock_fast);
diff --git a/patches/series b/patches/series
index 08521f92fb15..1fdec5e3b5ab 100644
--- a/patches/series
+++ b/patches/series
@@ -50,7 +50,6 @@ lockdep-Let-lock_is_held_type-detect-recursive-read-.patch
 ###########################################################################
 cgroup__use_irqsave_in_cgroup_rstat_flush_locked.patch
 mm__workingset__replace_IRQ-off_check_with_a_lockdep_assert..patch
-net__Move_lockdep_where_it_belongs.patch
 tcp__Remove_superfluous_BH-disable_around_listening_hash.patch
 samples_kfifo__Rename_read_lock_write_lock.patch
 smp_wake_ksoftirqd_on_preempt_rt_instead_do_softirq.patch
@@ -221,7 +220,6 @@ x86__Enable_RT_also_on_32bit.patch
 # For later, not essencial
 ###########################################################################
 genirq__update_irq_set_irqchip_state_documentation.patch
-mm-Fully-initialize-invalidate_lock-amend-lock-class.patch
 ASoC-mediatek-mt8195-Remove-unsued-irqs_lock.patch
 smack-Guard-smack_ipv6_lock-definition-within-a-SMAC.patch
 virt-acrn-Remove-unsued-acrn_irqfds_mutex.patch