From 6dedd768f380a6977234891fc3c7e0df656f1908 Mon Sep 17 00:00:00 2001 From: Markus Schneider-Pargmann Date: Wed, 28 Jun 2023 10:13:41 +0200 Subject: mailmap: add Markus Schneider-Pargmann Add my old mail address and update my name. Link: https://lkml.kernel.org/r/20230628081341.3470229-1-msp@baylibre.com Signed-off-by: Markus Schneider-Pargmann Signed-off-by: Andrew Morton --- .mailmap | 1 + 1 file changed, 1 insertion(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 4a9d87472ba8a..1131264331216 100644 --- a/.mailmap +++ b/.mailmap @@ -301,6 +301,7 @@ Marek Behún Marek Behún Marek Behun Mark Brown Mark Starovoytov +Markus Schneider-Pargmann Mark Yao Martin Kepplinger Martin Kepplinger -- cgit 1.2.3-korg From ddcd91f4cb42fcc833b0a5e00d4e9f034da95249 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Tue, 4 Jul 2023 18:39:18 +0200 Subject: mailmap: update manpage link Patch series "Update .mailmap for my work address and fix manpage". While updating mailmap for the going-away address, I also found that on current systems the manpage linked from the header comment changed. And in fact it looks like the git mailmap feature got its own manpage. This patch (of 2): On recent systems the git-shortlog manpage only tells people to See gitmailmap(5) So instead of sending people on a scavenger hunt, put that info into the header directly. Though keep the old reference around for older systems. Link: https://lkml.kernel.org/r/20230704163919.1136784-1-heiko@sntech.de Link: https://lkml.kernel.org/r/20230704163919.1136784-2-heiko@sntech.de Signed-off-by: Heiko Stuebner Signed-off-by: Andrew Morton --- .mailmap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index 1131264331216..e30928b8d23e0 100644 --- a/.mailmap +++ b/.mailmap @@ -5,7 +5,8 @@ # same person appearing not to be so or badly displayed. Also allows for # old email addresses to map to new email addresses. # -# For format details, see "MAPPING AUTHORS" in "man git-shortlog". +# For format details, see "man gitmailmap" or "MAPPING AUTHORS" in +# "man git-shortlog" on older systems. # # Please keep this list dictionary sorted. # -- cgit 1.2.3-korg From d3a808ec787e8cbfee053405f95105b3be3c7743 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Tue, 4 Jul 2023 18:39:19 +0200 Subject: mailmap: add entries for Heiko Stuebner I am going to lose my vrull.eu address at the end of july, and while adding it to mailmap I also realised that there are more old addresses from me dangling, so update .mailmap for all of them. Link: https://lkml.kernel.org/r/20230704163919.1136784-3-heiko@sntech.de Signed-off-by: Heiko Stuebner Signed-off-by: Heiko Stuebner Signed-off-by: Andrew Morton --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) (limited to '.mailmap') diff --git a/.mailmap b/.mailmap index e30928b8d23e0..a3b4d7ac25b57 100644 --- a/.mailmap +++ b/.mailmap @@ -178,6 +178,9 @@ Gustavo Padovan Hanjun Guo Heiko Carstens Heiko Carstens +Heiko Stuebner +Heiko Stuebner +Heiko Stuebner Henk Vergonet Henrik Kretzschmar Henrik Rydberg -- cgit 1.2.3-korg