From: David S. Miller <davem@davemloft.net>
Date: Sat, 19 Nov 2016 16:11:52 +0000 (-0500)
Subject: Merge tag 'batadv-net-for-davem-20161119' of git://git.open-mesh.org/linux-merge
X-Git-Tag: Ubuntu-5.0.0-8.9~6053^2~6
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=adda306744ec64c7bcd6c230a6bc060fb77bd7c3;p=mirror_ubuntu-disco-kernel.git

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

Simon Wunderlich says:

====================
Here are two batman-adv bugfix patches:

 - Revert a splat on disabling interface which created another problem,
   by Sven Eckelmann

 - Fix error handling when the primary interface disappears during a
   throughput meter test, by Sven Eckelmann
====================

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

adda306744ec64c7bcd6c230a6bc060fb77bd7c3