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

Simon Wunderlich says:

====================
This feature/cleanup patchset includes the following patches:

 - bump version strings, by Simon Wunderlich (we forgot to include
   this patch previously ...)

 - fix multicast tt/tvlv worker locking, by Linus Lüssing
====================

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

diff --cc net/batman-adv/main.c
Simple merge

diff --cc net/batman-adv/main.h
Simple merge

diff --cc net/batman-adv/multicast.c
Simple merge

diff --cc net/batman-adv/types.h
Simple merge