Merge tag 'batadv-next-for-davem-20200114' of git://git.open-mesh.org/linux-merge
authorDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2020 22:04:04 +0000 (23:04 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Jan 2020 22:04:04 +0000 (23:04 +0100)
commit8fec380ac0d4e57aaf0d475482b840a1f3e3e0f3
tree335d1ccead6510f188bc638100486b3fa93b4463
parent4e2fa6b902751da6e15ad1bc748a65498ed28c94
parentb2e55ca89245fccd459a2d56850822a69a6f91da
Merge tag 'batadv-next-for-davem-20200114' 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

 - fix typo and kerneldocs, by Sven Eckelmann

 - use WiFi txbitrate for B.A.T.M.A.N. V as fallback, by RenĂ© Treffer

 - silence some endian sparse warnings by adding annotations,
   by Sven Eckelmann

 - Update copyright years to 2020, by Sven Eckelmann

 - Disable deprecated sysfs configuration by default, by Sven Eckelmann
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
net/batman-adv/main.c