From: David S. Miller Date: Wed, 11 May 2016 03:36:14 +0000 (-0400) Subject: Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge X-Git-Tag: v4.7-rc1~154^2~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf88585b1d5ce49515aabb381812976e2840a967;p=thirdparty%2Fkernel%2Flinux.git Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge Antonio Quartulli says: ==================== Included changes: - remove useless skb size check in batadv_interface_rx - basic netns support introduced by Andrew Lunn: - prevent virtual interface from changing netns by setting NETIF_F_NETNS_LOCAL - create virtual interface within the netns of the first hard-interface - introduce detection of complex bridge loops and report event to the user (via udev) when the Bridge Loop Avoidance mechanism can't prevent them - minor reference counting bugfixes for the hard_iface object that couldn't make it via the net tree - use kref_get() instead of kref_get_unless_zero() to make reference counting bug more visible - use batadv_compare_eth() all over the code when possible instead of plain memcmp() - minor code cleanup and style adjustments ==================== Signed-off-by: David S. Miller --- cf88585b1d5ce49515aabb381812976e2840a967