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

The following commit has been merged in the master branch: commit 426988ee84c1d03cd5e158b4a360e01459709e95 Author: Simon Wunderlich sw@simonwunderlich.de Date: Fri Jul 31 20:36:21 2020 +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 0393bb9ed3d0..a47dc332d796 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 "2020.3" +#define BATADV_SOURCE_VERSION "2020.4" #endif

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