Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit aa58799a43140012e284ef907d3123c40d26281c Merge: 53c58c1 fb91b0e Author: Sven Eckelmann sven@narfation.org Date: Mon Mar 19 14:25:03 2018 +0100

Merge branch 'maint'

aa58799a43140012e284ef907d3123c40d26281c compat-include/linux/compiler.h | 4 +++ compat-include/linux/{export.h => eventpoll.h} | 12 ++++----- compat-include/linux/skbuff.h | 12 +++++++++ .../uapi/linux/{nl80211.h => eventpoll.h} | 31 ++++++++++++++-------- compat-sources/net/core/skbuff.c | 17 ------------ net/batman-adv/distributed-arp-table.c | 2 +- net/batman-adv/icmp_socket.c | 3 ++- net/batman-adv/log.c | 3 ++- net/batman-adv/routing.c | 25 ++++++++++------- 9 files changed, 62 insertions(+), 47 deletions(-)