Merge tag 'batadv-net-for-davem-20200306' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2020 02:08:43 +0000 (19:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Mar 2020 02:08:43 +0000 (19:08 -0700)
Simon Wunderlich says:

====================
Here is a batman-adv bugfix:

 - Don't schedule OGM for disabled interface, by Sven Eckelmann
====================

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

Trivial merge