On Mon, Sep 20 2021, Fangyi Zhou wrote:
> Acked-by: Peter Kaestle <peter@xxxxxxxx>
> Signed-off-by: Fangyi Zhou <me@xxxxxxxxx>
> ---
> .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 <esr@xxxxxxxxxxx>
> Eric Wong <e@xxxxxxxxx> <normalperson@xxxxxxxx>
> Erik Faye-Lund <kusmabite@xxxxxxxxx> <kusmabite@xxxxxxxxxxxxxx>
> Eyvind Bernhardsen <eyvind.bernhardsen@xxxxxxxxx> <eyvind-git@xxxxxxxxxxxxxx>
> -Fangyi Zhou <fangyi.zhou@xxxxxxxxxx> Zhou Fangyi
> +Fangyi Zhou <me@xxxxxxxxx> <fangyi.zhou@xxxxxxxxxx>
> +Fangyi Zhou <me@xxxxxxxxx> Zhou Fangyi <fangyi.zhou@xxxxxxxxxx>
> Florian Achleitner <florian.achleitner.2.6.31@xxxxxxxxx> <florian.achleitner2.6.31@xxxxxxxxx>
> Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> <fbuihuu@xxxxxxxxx>
> Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <djpig@xxxxxxxxxx>
> @@ -209,6 +210,7 @@ Paul Mackerras <paulus@xxxxxxxxx> <paulus@dorrigo.(none)>
> Paul Mackerras <paulus@xxxxxxxxx> <paulus@pogo.(none)>
> Peter Baumann <waste.manager@xxxxxx> <Peter.B.Baumann@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Peter Baumann <waste.manager@xxxxxx> <siprbaum@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> +Peter Kaestle <peter@xxxxxxxx> <peter.kaestle@xxxxxxxxx>
> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx>
> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
> Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx>
I'm sure the maintainer would appreciate you and Martin Ågren
<martin.agren@xxxxxxxxx> (CC'd) coordinating, i.e. there's also this
outstanding change that overlaps with yours:
https://lore.kernel.org/git/20200816153037.1143576-1-martin.agren@xxxxxxxxx/
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 <fangyi.zhou@xxxxxxxxxx> Zhou Fangyi
+Fangyi Zhou <fangyi.zhou@xxxxxxxxxx>
+<fangyi.zhou@xxxxxxxxxx> <me@xxxxxxxxx>
I understand per recent mailmap discussion that Junio prefers having the
entries sorted over eliminating redundancy.
