[PATCH 8/8] .mailmap: Miscellaneous fixes on various emails

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

Misc cleanups:
- unordered lastname/firstname
- caps in email
- extra information in name (like computer used, ...)

Signed-off-by: Philippe Mathieu-Daude <philmd@redhat.com>
---
 .mailmap | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.mailmap b/.mailmap
index 807ac3fbbac3..2f47baa7dff8 100644
--- a/.mailmap
+++ b/.mailmap
@@ -11,15 +11,21 @@
 #
 
 Albecki Mateusz <mateusz.albecki@intel.com> </o=Intel/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=Albecki, Mateusz3be>
+Alexei Fedorov <alexei.fedorov@arm.com>
+Alexei Fedorov <alexei.fedorov@arm.com> <Alexei.Fedorov@arm.com>
 Alex Gu <xgu3@users.sourceforge.net> <xgu3@6f19259b-4bc3-4df7-8a09-765794883524>
 Amy Chan <amy.chan@intel.com>
+Andrew Fish <afish@apple.com> <afish@apple.com>
 Andrew Fish <afish@apple.com> <ajfish@6f19259b-4bc3-4df7-8a09-765794883524>
 Andrew Fish <afish@apple.com> <andrewfish@6f19259b-4bc3-4df7-8a09-765794883524>
 Antoine Cœur <coeur@gmx.fr>
 Antoine Cœur <coeur@gmx.fr> <Coeur@gmx.fr>
 Ashraf Javeed <ashraf.javeed@intel.com>
+Baraneedharan Anbazhagan <anbazhagan@hp.com>
 Bell Song <binx.song@intel.com>
 Bob Feng <bob.c.feng@intel.com>
+Brendan Jackman <brendan.jackman@arm.com> <Brendan.Jackman@arm.com>
+Brendan Jackman <brendan.jackman@arm.com> <Brendan.JackMan@arm.com>
 Bruce Maynard <Bruce.Maynard@Emulex.Com> <darylm503@Edk2>
 Chao Zhang <chao.b.zhang@intel.com> <czhang46>
 Chao Zhang <chao.b.zhang@intel.com> <czhang46@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -33,9 +39,12 @@ Dandan Bi <dandan.bi@intel.com> <C:/Program Files (x86)/Git/o=Intel/ou=Exchange
 Dandan Bi <dandan.bi@intel.com> </o=Intel/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=Bi, Dandan08b>
 Daryl McDaniel <daryl.mcdaniel@intel.com>
 Daryl McDaniel <daryl.mcdaniel@intel.com> <darylm503@6f19259b-4bc3-4df7-8a09-765794883524>
+Daryl McDaniel <daryl.mcdaniel@intel.com> Daryl McDaniel <edk2-lists@mc2research.org>
+David Chan <chenwei01@thtfpc.com>
 David Huang <hhuan13@users.sourceforge.net> <davidhuang@6f19259b-4bc3-4df7-8a09-765794883524>
 David Huang <hhuan13@users.sourceforge.net> <hhuan13@6f19259b-4bc3-4df7-8a09-765794883524>
 David Wei <david.wei@intel.com>
+Derek Lin <derek.lin2@hpe.com>
 Digant H Solanki <digant.h.solanki@intel.com>
 Ding Ting <tding1@users.sourceforge.net> <tding1@6f19259b-4bc3-4df7-8a09-765794883524>
 Dongao Guo <dongao.guo@intel.com>
@@ -47,6 +56,7 @@ Eric Dong <eric.dong@intel.com> ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-7657948
 Eric Jin <eric.jin@intel.com>
 Eric Jin <eric.jin@intel.com> <jjin9@6f19259b-4bc3-4df7-8a09-765794883524>
 Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>
+Eugene Cohen <eugene@hp.com>
 Feng Tian <feng.tian@intel.com> <eric_tian@6f19259b-4bc3-4df7-8a09-765794883524>
 Feng Tian <feng.tian@intel.com> <erictian@6f19259b-4bc3-4df7-8a09-765794883524>
 Fu Siyuan <siyuan.fu@intel.com>
@@ -58,6 +68,7 @@ Guo Dong <guo.dong@intel.com> <gdong1>
 Guo Dong <guo.dong@intel.com> <gdong1@6f19259b-4bc3-4df7-8a09-765794883524>
 Hao Wu <hao.a.wu@intel.com>
 Harry Liebel <Harry.Liebel@arm.com> NetBSD project <NetBSD project>
+Herbie Robinson <Herbie.Robinson@stratus.com>
 Hess Chen <hesheng.chen@intel.com>
 Hess Chen <hesheng.chen@intel.com> <hchen30@6f19259b-4bc3-4df7-8a09-765794883524>
 Hot Tian <hot.tian@intel.com>
@@ -69,6 +80,7 @@ Jaben Carsey <jaben.carsey@intel.com> <jcarsey>
 Jaben Carsey <jaben.carsey@intel.com> <jcarsey@6f19259b-4bc3-4df7-8a09-765794883524>
 Jaben Carsey <jaben.carsey@intel.com> <jcarsey@Edk2>
 Jaben Carsey <jaben.carsey@intel.com> </o=Intel/ou=Americas01/cn=Workers/cn=Carsey, Jaben>
+Jan Dabros <jsd@semihalf.com>
 Jeff Bobzin <jeff.bobzin@insyde.com> <Jeff Bobzin (jeff.bobzin@insyde.com)>
 Jeff Fan <jeff.fan@intel.com> <Jeff.fan@intel.com>
 Jeff Fan <jeff.fan@intel.com> <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -80,6 +92,8 @@ Jiewen Yao <jiewen.yao@intel.com> <Jiewen.yao@intel.com>
 Jiewen Yao <jiewen.yao@intel.com> <Jiewen.Yao@intel.com>
 Jiewen Yao <jiewen.yao@intel.com> <jyao1@6f19259b-4bc3-4df7-8a09-765794883524>
 Jiewen Yao <jiewen.yao@intel.com> <jyao1@Edk2>
+Jim Dailey <Jim.Dailey@Dell.com>
+Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>
 Jiong Gong <jgong5@users.sourceforge.net> <jgong5@6f19259b-4bc3-4df7-8a09-765794883524>
 Jordan Justen <jordan.l.justen@intel.com> <c:/oc6/Git/O=INTEL/OU=AMERICAS01/CN=WORKERS/CN=JUSTEN, JORDAN L>
 Jordan Justen <jordan.l.justen@intel.com> <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -112,6 +126,7 @@ Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists
 Marvin Häuser <mhaeuser@outlook.de>
 Mateusz Albecki <mateusz.albecki@intel.com>
 Maurice Ma <maurice.ma@intel.com>
+Maxim Shvecov <Gris87@yandex.ru>
 Michael Johnson <michael.johnson@intel.com>
 Michael Kinney <michael.d.kinney@intel.com>
 Michael Kinney <michael.d.kinney@intel.com> <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -125,9 +140,13 @@ Michael Zimmermann <sigmaepsilon92@gmail.com> <[mailto:sigmaepsilon92@gmail.com]
 Mike Wu <mike.wu@intel.com> <mikewuping@6f19259b-4bc3-4df7-8a09-765794883524>
 Ming Tan <ming.tan@intel.com>
 Myron Porter <myronporter@users.sourceforge.net> <MyronPorter@6f19259b-4bc3-4df7-8a09-765794883524>
+Nikolai Saoukh <nms@otdel-1.org>
 Olivier Martin <olivier.martin@arm.com> <oliviermartin>
 Olivier Martin <olivier.martin@arm.com> <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524>
+Olivier Martin <olivier.martin@arm.com> <Olivier.Martin@arm.com>
 Olivier Martin <olivier.martin@arm.com> <Olivier Martin olivier.martin@arm.com>
+Paulo Alcantara <paulo.alc.cavalcanti@hp.com>
+Pedroa Liu <pedroa.liu@outlook.com>
 Penny Gao <pgao2@users.sourceforge.net> <pgao2@6f19259b-4bc3-4df7-8a09-765794883524>
 Philippe Mathieu-Daudé <philmd@redhat.com>
 Qian Ouyang <qian.ouyang@intel.com>
@@ -140,12 +159,15 @@ Qin Long <qin.long@intel.com> <qlong>
 Qin Long <qin.long@intel.com> <qlong@6f19259b-4bc3-4df7-8a09-765794883524>
 Qiu Shumin <shumin.qiu@intel.com>
 Ray Ni <ray.ni@intel.com>
+Rebecca Cran <rebecca@bluestop.org>
 Rebecca Cran <rebecca@bluestop.org> <rebecca=bluestop.org@groups.io>
 Rebecca Cran <rebecca@bluestop.org> Rebecca Cran via edk2-devel <edk2-devel@lists.01.org>
+Rebecca Cran <rebecca@bsdio.com>
 Richard Du <xdu2@users.sourceforge.net> <xdu2@6f19259b-4bc3-4df7-8a09-765794883524>
 Richard Thomaiyar <richard.marian.thomaiyar@intel.com>
 Richard Thomaiyar <richard.marian.thomaiyar@intel.com> edk2-devel On Behalf Of rthomaiy <[mailto:edk2-devel-bounces@lists.01.org]>
 Rodrigo Gonzalez del Cueto <rodrigo.gonzalez.del.cueto@intel.com>
+Ronald Cron <ronald.cron@arm.com> <Ronald.Cron@arm.com>
 Rui Sun <rsun3@users.sourceforge.net> <rsun3@6f19259b-4bc3-4df7-8a09-765794883524>
 Ruiyu Ni <ruiyu.ni@intel.com>
 Ruiyu Ni <ruiyu.ni@intel.com> <C:/Program Files (x86)/Git/O=Intel/OU=Pacifica02/cn=Recipients/cn=rni2>
@@ -156,10 +178,12 @@ Sachin Agrawal <sachin.agrawal@intel.com>
 Samer El-Haj-Mahmoud <elhaj@hpe.com> <Samer El-Haj-Mahmoud elhaj@hp.com>
 Satya Yarlagadda <satya.p.yarlagadda@intel.com>
 Scott Wang <qwang12@users.sourceforge.net> <qwang12@6f19259b-4bc3-4df7-8a09-765794883524>
+Sergey Isakov <isakov-sl@bk.ru>
 Shenglei Zhang <shenglei.zhang@intel.com>
 Siyuan Fu <siyuan.fu@intel.com>
 Siyuan Fu <siyuan.fu@intel.com> <sfu5@6f19259b-4bc3-4df7-8a09-765794883524>
 Songpeng Li <songpeng.li@intel.com>
+Sriram Subramanian <sriram-s@hpe.com>
 Stanely Chen <jchen20@users.sourceforge.net> <jchen20@6f19259b-4bc3-4df7-8a09-765794883524>
 Star Zeng <star.zeng@intel.com>
 Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -168,6 +192,7 @@ Tian Feng <feng.tian@intel.com>
 Ting Ye <ting.ye@intel.com>
 Ting Ye <ting.ye@intel.com> <tye1@6f19259b-4bc3-4df7-8a09-765794883524>
 Ting Ye <ting.ye@intel.com> <tye@6f19259b-4bc3-4df7-8a09-765794883524>
+Tomas Pilar <tpilar@solarflare.com>
 Vanguput Narendra K <narendra.k.vanguput@intel.com>
 Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>
 Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>
@@ -175,6 +200,7 @@ Wang Fan <fan.wang@intel.com>
 Wang Fan <fan.wang@intel.com> edk2-devel-bounces@lists.01.org <edk2-devel-bounces@lists.01.org>
 Wang Yu <yu.wang@intel.com>
 Wei6 Xu <wei6.xu@intel.com>
+Xiaofeng Wang <winggundum82@163.com>
 Xiaoyu Lu <xiaoyux.lu@intel.com>
 Xue ShengfengX <shengfengx.xue@intel.com>
 Yan Wang <ywang@users.sourceforge.net> <ywang@6f19259b-4bc3-4df7-8a09-765794883524>
@@ -182,6 +208,7 @@ Yao Jiewen <jiewen.yao@intel.com> <jyao1>
 Yao Jiewen <jiewen.yao@intel.com> <jyao1@6f19259b-4bc3-4df7-8a09-765794883524>
 Yao Jiewen <jiewen.yao@intel.com> <jyao1@Edk2>
 Yonghong Zhu <yonghong.zhu@intel.com>
+Yu-Chen Lin <yuchenlin@synology.com>
 Yunhua Feng <yunhuax.feng@intel.com>
 Yunhua Feng <yunhuax.feng@intel.com> </o=Intel/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=Feng, YunhuaX4e1>
 Zailiang Sun <zailiang.sun@intel.com> </o=Intel/ou=Exchange Administrative Group (FYDIBOHF23SPDLT)/cn=Recipients/cn=Sun, Zailiangf5d>
-- 
2.21.0