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

The following commit has been merged in the master branch: commit a7c4a547ea1de2e9d6cb82263962aaff3ba67ff5 Author: Simon Wunderlich sw@simonwunderlich.de Date: Mon Nov 25 09:06:16 2019 +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 c7b340ddd0e7..fd8c0728ddc7 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -13,7 +13,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv"

#ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2019.5" +#define BATADV_SOURCE_VERSION "2020.0" #endif

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