The following commit has been merged in the master branch: commit 55793d2a431c184c8b9774f5df41d7f533505d8e Merge: 0a29ac5bd3a988dc151c8d26910dec2557421f64 40e220b4218bb3d278e5e8cc04ccdfd1c7ff8307 Author: David S. Miller davem@davemloft.net Date: Mon Oct 28 16:39:07 2019 -0700

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