The following commit has been merged in the master branch: commit a283ad5066cd63f595224c7476001cfc367fdf2e Merge: 6ce40fc5413cf01056416c24fc340c0409981221 4c7da0f6dbcde2431d773ce03cde5e7abede54e0 Author: David S. Miller davem@davemloft.net Date: Sat Oct 29 16:26:50 2016 -0400

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

Simon Wunderlich says:

==================== This code cleanup patchset includes the following changes (chronological order):

- bump version strings, by Simon Wunderlich

- README updates/clean up, by Sven Eckelmann (4 patches)

- Code clean up and restructuring by Sven Eckelmann (2 patches)

- Kerneldoc fix in forw_packet structure, by Linus Luessing

- Remove unused argument in dbg_arp, by Antonio Quartulli

- Add support to build batman-adv without wireless, by Linus Luessing

- Restructure error handling for is_ap_isolated, by Markus Elfring

- Remove unused initialization in various functions, by Sven Eckelmann

- Use better names for fragment and gateway list heads, by Sven Eckelmann (2 patches)

- Convert to octal permissions for files, by Sven Eckelmann

- Avoid precedence issues for some macros, by Sven Eckelmann ====================

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