Merge tag 'batadv-net-for-davem-20190509' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 9 May 2019 16:44:17 +0000 (09:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 May 2019 16:44:17 +0000 (09:44 -0700)
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>
1  2 
net/batman-adv/main.c
net/batman-adv/main.h
net/batman-adv/multicast.c
net/batman-adv/types.h

Simple merge
Simple merge
Simple merge
Simple merge