This is a note to let you know that I've just added the patch titled batman-adv: Fix lockdep annotation of batadv_tlv_container_remove to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: batman-adv-fix-lockdep-annotation-of-batadv_tlv_container_remove.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 008a374487070a391c12aa39288fd8511f822cab Mon Sep 17 00:00:00 2001 From: Sven Eckelmann <sven@xxxxxxxxxxxxx> Date: Tue, 3 Nov 2015 19:20:34 +0100 Subject: batman-adv: Fix lockdep annotation of batadv_tlv_container_remove From: Sven Eckelmann <sven@xxxxxxxxxxxxx> commit 008a374487070a391c12aa39288fd8511f822cab upstream. The function handles tlv containers and not tlv handlers. Thus the lockdep_assert_held has to check for the container_list lock. Fixes: 2c72d655b044 ("batman-adv: Annotate deleting functions with external lock via lockdep") Signed-off-by: Sven Eckelmann <sven@xxxxxxxxxxxxx> Signed-off-by: Marek Lindner <mareklindner@xxxxxxxxxxxxx> Signed-off-by: Antonio Quartulli <a@xxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/batman-adv/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -747,7 +747,7 @@ static u16 batadv_tvlv_container_list_si static void batadv_tvlv_container_remove(struct batadv_priv *bat_priv, struct batadv_tvlv_container *tvlv) { - lockdep_assert_held(&bat_priv->tvlv.handler_list_lock); + lockdep_assert_held(&bat_priv->tvlv.container_list_lock); if (!tvlv) return; Patches currently in stable-queue which might be from sven@xxxxxxxxxxxxx are queue-4.4/batman-adv-fix-lockdep-annotation-of-batadv_tlv_container_remove.patch