meta: align collaborator email in .mailmap/AUTHORS with README

Trott · BethGriggs · commit dc9c6aa428df · 2021-07-29T11:56:55.000+01:00
Use the most recent and presumably preferred email for a collaborator whose .mailmap and README entries differ. PR-URL: #39478 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/.mailmap b/.mailmap
@@ -231,8 +231,8 @@ Kazuyuki Yamada <tasogare.pg@gmail.com>
 Keith M Wesolowski <wesolows@joyent.com> <wesolows@foobazco.org>
 Kelsey Breseman <ifoundthemeaningoflife@gmail.com>
 Ke Ding <dingkework@hotmail.com>
-Khaidi Chu <admin@xcoder.in>
-Khaidi Chu <admin@xcoder.in> <i@2333.moe>
+Khaidi Chu <i@2333.moe>
+Khaidi Chu <i@2333.moe> <admin@xcoder.in>
 Kimberly Wilber <gcr@sneakygcr.net>
 Kimberly Wilber <gcr@sneakygcr.net> <gcr@users.noreply.github.com>
 Kiyoshi Nomo <tokyoincidents.g@gmail.com>
diff --git a/AUTHORS b/AUTHORS
@@ -1494,7 +1494,7 @@ Sreepurna Jasti <sreepurna.jasti@gmail.com>
 Rafael Fragoso <rafaelfragosom@gmail.com>
 Andrei Cioromila <andrei.cioromila@gmail.com>
 Frank Lanitz <frank@frank.uvena.de>
-Khaidi Chu <admin@xcoder.in>
+Khaidi Chu <i@2333.moe>
 Akshay Iyer <c.m.akshay.iyer@gmail.com>
 Rick Bullotta <RickBullotta@users.noreply.github.com>
 Rajaram Gaunker <zimbabao@gmail.com>

-Original file line number
+Diff line change
 Keith M Wesolowski <[email protected]> <[email protected]>
 Kelsey Breseman <[email protected]>
 Ke Ding <[email protected]>
 -Khaidi Chu <[email protected]>
 -Khaidi Chu <[email protected]> <[email protected]>
 +Khaidi Chu <[email protected]>
 +Khaidi Chu <[email protected]> <[email protected]>
 Kimberly Wilber <[email protected]>
 Kimberly Wilber <[email protected]> <[email protected]>
 Kiyoshi Nomo <[email protected]>
-Original file line number
+Diff line change
 Rafael Fragoso <[email protected]>
 Andrei Cioromila <[email protected]>
 Frank Lanitz <[email protected]>
 -Khaidi Chu <[email protected]>
 +Khaidi Chu <[email protected]>
 Akshay Iyer <[email protected]>
 Rick Bullotta <[email protected]>
 Rajaram Gaunker <[email protected]>