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

The following commit has been merged in the master branch: commit b1d2cf3de334d84812ea2a2ab287867f07c3ef26 Author: Simon Wunderlich sw@simonwunderlich.de Date: Tue May 23 11:41:54 2017 +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 810f7d026f54..feaf60e4cbc3 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.1" +#define BATADV_SOURCE_VERSION "2017.2" #endif

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