Merge tag 'batadv-next-for-davem-20170126' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 26 Jan 2017 19:31:08 +0000 (14:31 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Jan 2017 19:31:08 +0000 (14:31 -0500)
commit49b3eb772505dc42b61c2920ca777d55455a8ee4
treed0279114338f465c6055e4b2f3398eb5bb0c79c2
parent27d807180ae0a9e50d90adf9b22573c21be904c2
parentc33705188c493b7de3b8dc2956d67de91b444727
Merge tag 'batadv-next-for-davem-20170126' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich

 - ignore self-generated loop detect MAC addresses in translation table,
   by Simon Wunderlich

 - install uapi batman_adv.h header, by Sven Eckelmann

 - bump copyright years, by Sven Eckelmann

 - Remove an unused variable in translation table code, by Sven Eckelmann

 - Handle NET_XMIT_CN like NET_XMIT_SUCCESS (revised according to Davids
   suggestion), and a follow up code clean up, by Gao Feng (2 patches)
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/uapi/linux/Kbuild
net/batman-adv/bridge_loop_avoidance.c
net/batman-adv/distributed-arp-table.c
net/batman-adv/soft-interface.c