The following commit has been merged in the batadv/net-next branch: commit 7bce3f75189c1c2d7b43af8184b284d783e51375 Author: Marek Lindner marek.lindner@mailbox.org Date: Fri Dec 27 10:19:12 2024 +0100

MAINTAINERS: update email address of Marek Linder

Signed-off-by: Marek Lindner marek.lindner@mailbox.org Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Simon Wunderlich sw@simonwunderlich.de

diff --git a/.mailmap b/.mailmap index 5ff0e5d681e7c..53e038f5f6545 100644 --- a/.mailmap +++ b/.mailmap @@ -427,6 +427,8 @@ Marcin Nowakowski marcin.nowakowski@mips.com marcin.nowakowski@imgtec.com Marc Zyngier maz@kernel.org marc.zyngier@arm.com Marek Behún kabel@kernel.org marek.behun@nic.cz Marek Behún kabel@kernel.org Marek Behun marek.behun@nic.cz +Marek Lindner marek.lindner@mailbox.org lindner_marek@yahoo.de +Marek Lindner marek.lindner@mailbox.org mareklindner@neomailbox.ch Mark Brown broonie@sirena.org.uk Mark Starovoytov mstarovo@pm.me mstarovoitov@marvell.com Markus Schneider-Pargmann msp@baylibre.com mpa@pengutronix.de diff --git a/Documentation/networking/batman-adv.rst b/Documentation/networking/batman-adv.rst index 8a0dcb1894b49..44b9b5cc0e24b 100644 --- a/Documentation/networking/batman-adv.rst +++ b/Documentation/networking/batman-adv.rst @@ -164,5 +164,5 @@ Mailing-list:

You can also contact the Authors:

-* Marek Lindner mareklindner@neomailbox.ch +* Marek Lindner marek.lindner@mailbox.org * Simon Wunderlich sw@simonwunderlich.de diff --git a/MAINTAINERS b/MAINTAINERS index 1e930c7a58b13..c5e909a759e67 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3867,7 +3867,7 @@ S: Maintained F: drivers/platform/x86/barco-p50-gpio.c

BATMAN ADVANCED -M: Marek Lindner mareklindner@neomailbox.ch +M: Marek Lindner marek.lindner@mailbox.org M: Simon Wunderlich sw@simonwunderlich.de M: Antonio Quartulli a@unstable.cc M: Sven Eckelmann sven@narfation.org diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 1fbe3a4dd9650..964f3088af5b5 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -7,7 +7,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_

-#define BATADV_DRIVER_AUTHOR "Marek Lindner mareklindner@neomailbox.ch, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner marek.lindner@mailbox.org, " \ "Simon Wunderlich sw@simonwunderlich.de" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv"