Subject: Re: [PATCH v2] .mailmap: Update mailmap entry for Fangyi Zhou and Peter Kaestle

From: Ævar Arnfjörð Bjarmason <[email-masked]>
Date: Mon, 20 Sep 2021 13:18:58 +0200

On Mon, Sep 20 2021, Fangyi Zhou wrote:

> Acked-by: Peter Kaestle <[email-masked]>
> Signed-off-by: Fangyi Zhou <[email-masked]>
> ---
>  .mailmap | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/.mailmap b/.mailmap
> index 9c6a446bdf..854f397796 100644
> --- a/.mailmap
> +++ b/.mailmap
> @@ -70,7 +70,8 @@ Eric S. Raymond <[email-masked]>
>  Eric Wong <[email-masked]> <[email-masked]>
>  Erik Faye-Lund <[email-masked]> <[email-masked]>
>  Eyvind Bernhardsen <[email-masked]> <[email-masked]>
> -Fangyi Zhou <[email-masked]> Zhou Fangyi
> +Fangyi Zhou <[email-masked]> <[email-masked]>
> +Fangyi Zhou <[email-masked]> Zhou Fangyi <[email-masked]>
>  Florian Achleitner <[email-masked]> <[email-masked]>
>  Franck Bui-Huu <[email-masked]> <[email-masked]>
>  Frank Lichtenheld <[email-masked]> <[email-masked]>
> @@ -209,6 +210,7 @@ Paul Mackerras <[email-masked]> <paulus@dorrigo.(none)>
>  Paul Mackerras <[email-masked]> <paulus@pogo.(none)>
>  Peter Baumann <[email-masked]> <[email-masked]>
>  Peter Baumann <[email-masked]> <[email-masked]>
> +Peter Kaestle <[email-masked]> <[email-masked]>
>  Peter Krefting <[email-masked]> <[email-masked]>
>  Peter Krefting <[email-masked]> <[email-masked]>
>  Petr Baudis <[email-masked]> <[email-masked]>

I'm sure the maintainer would appreciate you and Martin Ågren
<[email-masked]> (CC'd) coordinating, i.e. there's also this
outstanding change that overlaps with yours:

    https://lore.kernel.org/git/[email-masked]/

I.e. can everyone who wants to update the mailmap consolidate their
discussion/changes into one thread and come up with some recipe that
works for all of them?

FWIW I validated the change you made, while you could do your hunk more
minimally as:

    -Fangyi Zhou <[email-masked]> Zhou Fangyi
    +Fangyi Zhou <[email-masked]>
    +<[email-masked]> <[email-masked]>

I understand per recent mailmap discussion that Junio prefers having the
entries sorted over eliminating redundancy.