[linux-next] LinuxNextTracking branch, master, updated. next-20180529

The following commit has been merged in the master branch: commit f546a99d62e5d4550a73c2ca0af51212a4fd46df Author: Simon Wunderlich sw@simonwunderlich.de Date: Thu Apr 19 19:23:35 2018 +0200

batman-adv: Start new development cycle

Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 057a28a9fe88..8da3c9336111 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -25,7 +25,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2018.1" +#define BATADV_SOURCE_VERSION "2018.2" #endif

/* B.A.T.M.A.N. parameters */