The following commit has been merged in the master branch: commit 7b5e73961915438d623cb80eea97868b3a66cc48 Author: Sven Eckelmann sven@narfation.org Date: Sun Dec 6 16:15:07 2015 +0100

batman-adv: Switch to HTTPS version of links

open-mesh.org and its subdomains can only be accessed via HTTPS. HTTP-only requests are currently redirected automatically to HTTPS but references in the source code should be only https.

Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner mareklindner@neomailbox.ch Signed-off-by: Antonio Quartulli a@unstable.cc

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt index ff23b75..1b5e7a7 100644 --- a/Documentation/networking/batman-adv.txt +++ b/Documentation/networking/batman-adv.txt @@ -187,7 +187,7 @@ interfaces to the kernel module settings.

For more information, please see the manpage (man batctl).

-batctl is available on http://www.open-mesh.org/ +batctl is available on https://www.open-mesh.org/

CONTACT diff --git a/MAINTAINERS b/MAINTAINERS index f678c37..1e216aa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2147,7 +2147,7 @@ M: Marek Lindner mareklindner@neomailbox.ch M: Simon Wunderlich sw@simonwunderlich.de M: Antonio Quartulli a@unstable.cc L: b.a.t.m.a.n@lists.open-mesh.org -W: http://www.open-mesh.org/ +W: https://www.open-mesh.org/ S: Maintained F: net/batman-adv/

diff --git a/net/batman-adv/Kconfig b/net/batman-adv/Kconfig index c6fc8f7..2dd40e5 100644 --- a/net/batman-adv/Kconfig +++ b/net/batman-adv/Kconfig @@ -12,7 +12,7 @@ config BATMAN_ADV B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. The networks may be wired or wireless. See - http://www.open-mesh.org/ for more information and user space + https://www.open-mesh.org/ for more information and user space tools.

config BATMAN_ADV_BLA