[PATCH] .mailmap: Update mailmap
From: Fangyi Zhou <hidden>
Date: 2021-09-10 13:02:54
Subsystem:
the rest · Maintainer:
Linus Torvalds
Similar to a35b13fce0 (Update .mailmap, 2018-11-09). This patch makes the output of `git shortlog -nse v2.10.0..master` duplicate-free by taking/guessing the current and preferred addresses for authors that appear with more than one address. Updated from [ref], taking into consideration of [ref], and other replies. Use the by far most common e-mail address: * Brandon Williams * Jiang Xin Use the most recent e-mail address: * Birger Skogeng Pedersen * Christopher Díaz Riveros * Ed Maste * Fangyi Zhou * Jean-Noël Avila * Kevin Willford * Peter Kaestle Use the one from their "Signed-off-by": * Damien Robert * Kazuhiro Kato * Sibi Siddharthan Use the most recent name / name with correct accents: * CB Bailey * Christopher Díaz Riveros * Jessica Clarke * Slavica Đukić Do not merge: * Andreas Schwab Signed-off-by: Fangyi Zhou <redacted> --- Please let me know if you approve those changes or not. If no reply is received, the entry will be added in comments. --- .mailmap | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/.mailmap b/.mailmap
index 9c6a446bdf..ff0887d9e0 100644
--- a/.mailmap
+++ b/.mailmap@@ -27,13 +27,16 @@ Ben Peart <benpeart@microsoft.com> <peartben@gmail.com> Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca> Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr> Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca> +Birger Skogeng Pedersen <birger.sp@gmail.com> <birgersp@gmail.com> Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil> Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com> +Brandon Williams <bwilliamseng@gmail.com> <bmwill@google.com> brian m. carlson <sandals@crustytoothpaste.net> brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx> brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com> Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com> Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com> +CB Bailey <cbailey32@bloomberg.net> Charles Bailey Cheng Renquan <crquan@gmail.com> Chris Shoemaker <c.shoemaker@cox.net> Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
@@ -41,10 +44,12 @@ Christian Ludwig <chrissicool@gmail.com> <chrissicool@googlemail.com> Cord Seele <cowose@gmail.com> <cowose@googlemail.com> Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com> Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee> -Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros +Christopher Díaz Riveros <christopher.diaz.riv@gmail.com> <chrisadr@gentoo.org> +Christopher Díaz Riveros <christopher.diaz.riv@gmail.com> Christopher Diaz Riveros Clemens Buchacher <drizzd@gmx.net> <drizzd@aon.at> Clemens Buchacher <drizzd@gmx.net> <clemens.buchacher@intel.com> Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu> +Damien Robert <damien.olivier.robert+git@gmail.com> <damien.olivier.robert@gmail.com> Dan Johnson <computerdruid@gmail.com> Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com> Dana L. How <danahow@gmail.com> Dana How
@@ -64,13 +69,15 @@ Derrick Stolee <dstolee@microsoft.com> Derrick Stolee via GitGitGadget <gitgitga Deskin Miller <deskinm@umich.edu> Đoàn Trần Công Danh <congdanhqx@gmail.com> Doan Tran Cong Danh Dirk Süsserott <newsletter@dirk.my1.cc> +Ed Maste <emaste@FreeBSD.org> <emaste@freebsd.org> Eric Blake <eblake@redhat.com> <ebb9@byu.net> Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net> Eric S. Raymond <esr@thyrsus.com> Eric Wong <e@80x24.org> <normalperson@yhbt.net> Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com> Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no> -Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi +Fangyi Zhou <me@fangyi.io> <fangyi.zhou@yuriko.moe> +Fangyi Zhou <me@fangyi.io> Zhou Fangyi <fangyi.zhou@yuriko.moe> Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com> Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com> Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
@@ -102,11 +109,14 @@ Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu> Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com> Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA +Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila <jean-noel.avila@scantech.fr> Jeff King <peff@peff.net> <peff@github.com> Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net> Jens Axboe <axboe@kernel.dk> <axboe@suse.de> Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com> Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com> +Jessica Clarke <jrtc27@jrtc27.com> James Clarke +Jiang Xin <worldhello.net@gmail.com> <zhiyou.jx@alibaba-inc.com> Jim Meyering <jim@meyering.net> <meyering@redhat.com> Joachim Berdal Haga <cjhaga@fys.uio.no> Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
@@ -138,10 +148,12 @@ Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de> Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com> Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de> Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)> +Kazuhiro Kato <kato-k@ksysllc.co.jp> <kazuhiro.kato@hotmail.co.jp> Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com> Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu> Kent Engstrom <kent@lysator.liu.se> Kevin Leung <kevinlsk@gmail.com> +Kevin Willford <Kevin.Willford@microsoft.com> <kewillf@microsoft.com> Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru> Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru> Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
@@ -211,6 +223,7 @@ Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlang Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de> Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se> Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se> +Peter Kaestle <peter@piie.net> <peter.kaestle@nokia.com> Petr Baudis <pasky@ucw.cz> <pasky@suse.cz> Petr Baudis <pasky@ucw.cz> <xpasky@machine> Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
@@ -242,9 +255,11 @@ Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com> Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org> Shawn O. Pearce <spearce@spearce.org> Wei Shuyu <wsy@dogben.com> Shuyu Wei +Sibi Siddharthan <sibisiddharthan.github@gmail.com> <sibisiv.siddharthan@gmail.com> Sidhant Sharma <tigerkid001@gmail.com> Sidhant Sharma [:tk] Simon Hausmann <hausmann@kde.org> <simon@lst.de> Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com> +Slavica Đukić <slawica92@hotmail.com> Slavica Djukic <slavicadj.ip2018@gmail.com> Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com> Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com> Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
@@ -296,3 +311,7 @@ Yi-Jyun Pan <pan93412@gmail.com> anonymous <linux@horizon.com> anonymous <linux@horizon.net> İsmail Dönmez <ismail@pardus.org.tr> + +# Do not merge +# Andreas Schwab <schwab@linux-m68k.org> +# Andreas Schwab <schwab@suse.de>
--
2.32.0