Merge tag 'batadv-next-for-davem-20190808' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Thu, 8 Aug 2019 18:28:40 +0000 (11:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 8 Aug 2019 18:28:40 +0000 (11:28 -0700)
Simon Wunderlich says:

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

 - bump version strings, by Simon Wunderlich

 - Replace usage of strlcpy with strscpy, by Sven Eckelmann

 - Add OGMv2 per-interface queue and aggregations, by Linus Luessing
   (2 patches)
====================

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

Trivial merge