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

The following commit has been merged in the master branch: commit 02dd9a8afab42d63ca89a0e7dc8c45c5bebeb710 Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Dec 4 13:14:39 2017 +0100

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 edb2f239d04d..bb8003cf2296 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -24,7 +24,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2017.4" +#define BATADV_SOURCE_VERSION "2018.0" #endif

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