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)
commitd7e163ced48f942c9a307117e15b0f863a01bc1e
treeaf9b356a71bf6b9b25c8c7f0fd3d4829d363f2a4
parent2cf672709beb005f6e90cb4edbed6f2218ba953e
parenta3c7cd0cdf1107f891aff847ad481e34df727055
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>
net/batman-adv/main.c
net/batman-adv/main.h
net/batman-adv/multicast.c
net/batman-adv/types.h