[linux-next] LinuxNextTracking branch, master, updated. next-20160505

batman at open-mesh.org batman at open-mesh.org
Fri May 6 00:15:47 CEST 2016

The following commit has been merged in the master branch:
commit 98a5b1d88c2b03be3ce8c0c0034523779dcc384f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Mon Feb 22 18:55:32 2016 +0100

    batman-adv: Fix kerneldoc for batadv_compare_claim
    Signed-off-by: Sven Eckelmann <sven at narfation.org>
    Signed-off-by: Marek Lindner <mareklindner at neomailbox.ch>
    Signed-off-by: Antonio Quartulli <a at unstable.cc>

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index 20b2fd9..60d3323 100644
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -120,7 +120,7 @@ static int batadv_compare_backbone_gw(const struct hlist_node *node,
- * batadv_compare_backbone_gw - compare address and vid of two claims
+ * batadv_compare_claim - compare address and vid of two claims
  * @node: list node of the first entry to compare
  * @data2: pointer to the second claims


More information about the linux-merge mailing list