The following commit has been merged in the master branch: commit 34dbba5d2dafc8ec0f9d70a0d9ac5c4504f27ccd Merge: 84826ac7337ed9af8a57c6445773d63d2fbe2fbc 7d652669b61d702c6e62a39579d17f6881670ab6 Author: David S. Miller davem@davemloft.net Date: Fri Feb 1 10:19:26 2019 -0800

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

Simon Wunderlich says:

==================== Here are some batman-adv bugfixes:

- Avoid WARN to report incorrect configuration, by Sven Eckelmann

- Fix mac header position setting, by Sven Eckelmann

- Fix releasing station statistics, by Felix Fietkau ====================

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