Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Mon, 28 Oct 2019 23:39:07 +0000 (16:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 28 Oct 2019 23:39:07 +0000 (16:39 -0700)
commit55793d2a431c184c8b9774f5df41d7f533505d8e
tree5824f04586305105333a55553ea81838ccf75011
parent0a29ac5bd3a988dc151c8d26910dec2557421f64
parent40e220b4218bb3d278e5e8cc04ccdfd1c7ff8307
Merge tag 'batadv-net-for-davem-20191025' of git://git.open-mesh.org/linux-merge

Simon Wunderlich says:

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

 * Fix free/alloc race for OGM and OGMv2, by Sven Eckelmann (2 patches)
====================

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