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

The following commit has been merged in the master branch: commit a311abdffb06b66b5160cb3305450a79a3918a8f Author: Simon Wunderlich sw@simonwunderlich.de Date: Fri Jul 28 13:39:52 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 2be8f1f46529..05cc7637c064 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.2" +#define BATADV_SOURCE_VERSION "2017.3" #endif

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