[PATCH] MAINTAINERS: update email address of Marek Linnder

[PATCH] MAINTAINERS: update email address of Marek Linnder

[Marek Lindner]

Signed-off-by: Marek Lindner <marek.lindner@mailbox.org>
---
 MAINTAINERS           | 2 +-
 net/batman-adv/main.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 1120a7d8..9ea7a1e4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,5 +1,5 @@
 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 7d0e25ce..276e9421 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"
-- 
2.45.2

Re: [PATCH] MAINTAINERS: update email address of Marek Linnder

[Linus Lüssing]

On Fri, Dec 27, 2024 at 10:19:12AM +0100, Marek Lindner wrote:
> Signed-off-by: Marek Lindner <marek.lindner@mailbox.org>
> ---
>  MAINTAINERS           | 2 +-
>  net/batman-adv/main.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Would it maybe make sense to also add a .mailmap file to
both batman-adv and batctl?

This is useful for tools like "git shortlog -sne" to associate
multiple (potentially deprecated) emails to the same person.
(Or even multiple author names to the same person, like it
sometimes happens with my Lüssing vs. Luessing surname.)

There's also a manpage for it, "man gitmailmap". And .mailmap is
already used and present on the upstream Linux kernel. But it's
missing for our off-tree batman-adv repo right now.

Regards, Linus