The following commit has been merged in the master branch: commit 7de84403a2020874714f6f40170f5ef9fc7ab58e Merge: c5549ee40112f2511a794c9aad7eb6ac5f18b0eb a1a745ef980a1b48299ead4ea7990e62c0516f6e Author: David S. Miller davem@davemloft.net Date: Tue Jun 13 13:46:01 2017 -0400

Merge tag 'batadv-net-for-davem-20170613' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

==================== Here are two batman-adv bugfixes:

- fix rx packet counters for local ARP replies, by Sven Eckelmann

- fix memory leaks for unicast packetes received from another gateway in bridge loop avoidance, by Andreas Pape ====================

Signed-off-by: David S. Miller davem@davemloft.net