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

The following commit has been merged in the master branch: commit 138c72efbd5dbb8b5b9cacb51523943576410fc1 Author: Simon Wunderlich sw@simonwunderlich.de Date: Fri Sep 14 10:50:05 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 8da3c9336111..2002b70e18db 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.2" +#define BATADV_SOURCE_VERSION "2018.4" #endif

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