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)
commit2362059427494b9e318161f0447a10dc5513b2c3
tree3f40769df9d9443bb85add85fe1a85f20e81a6cc
parenta8015ded89ad740d21355470d41879c5bd82aab7
parent8e8ce08198de193e3d21d42e96945216e3d9ac7f
Merge tag 'batadv-net-for-davem-20200306' of git://git.open-mesh.org/linux-merge

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>