The lines in .mailmap are supposed to be sorted, they have
gotten out of order over time.

Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 .mailmap | 70 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/.mailmap b/.mailmap
index c7d55c7386..0be4d883c9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -48,7 +48,6 @@ Aleksey Baulin <aleksey.bau...@gmail.com>
 Aleksey Katargin <gure...@gmail.com>
 Ales Musil <amu...@redhat.com>
 Alessio Igor Bogani <alessio.bog...@elettra.eu>
-Alex Chapman <alex.chap...@arm.com>
 Alexander Bechikov <asb.t...@gmail.com>
 Alexander Belyakov <abely...@gmail.com>
 Alexander Chernavin <acherna...@netgate.com>
@@ -59,6 +58,7 @@ Alexander Skorichenko <askoriche...@netgate.com>
 Alexander Solganik <solga...@gmail.com>
 Alexander V Gutkin <alexander.v.gut...@intel.com>
 Alexandre Ferrieux <alexandre.ferri...@orange.com>
+Alex Chapman <alex.chap...@arm.com>
 Alexey Kardashevskiy <a...@ozlabs.ru>
 Alex Kiselev <a...@bisonrouter.com> <a...@therouter.net>
 Alex Marginean <alexandru.margin...@nxp.com>
@@ -83,8 +83,8 @@ Aman Singh <aman.deep.si...@intel.com>
 Amaranath Somalapuram <asoma...@amd.com>
 Amine Kherbouche <amine.kherbou...@6wind.com>
 Amin Tootoonchian <am...@icsi.berkeley.edu>
-Ami Sabo <a...@radware.com>
 Amir Avivi <amir.av...@intel.com>
+Ami Sabo <a...@radware.com>
 Amit Bernstein <amitb...@amazon.com>
 Amit Gupta <agup...@marvell.com>
 Amit Prakash Shukla <amitpraka...@marvell.com>
@@ -100,9 +100,9 @@ Anatolii Gerasymenko <anatolii.gerasyme...@intel.com>
 Anatoly Burakov <anatoly.bura...@intel.com>
 Anbarasan Murugesan <anbarasanx.muruge...@intel.com>
 Anders Roxell <anders.rox...@linaro.org>
-Andre Muezerie <andre...@linux.microsoft.com> <andre...@microsoft.com>
 Andrea Arcangeli <aarca...@redhat.com>
 Andrea Grandi <andrea.gra...@intel.com>
+Andre Muezerie <andre...@linux.microsoft.com> <andre...@microsoft.com>
 Andre Richter <andre.o.rich...@gmail.com>
 Andrew Boyer <andrew.bo...@amd.com> <abo...@pensando.io>
 Andrew Harvey <a...@cisco.com>
@@ -131,8 +131,8 @@ Antara Ganesh Kolar <antara.ganesh.ko...@intel.com>
 Anthony Fee <anthonyx....@intel.com>
 Anthony Harivel <ahari...@redhat.com>
 Antonio Fischetti <antonio.fische...@intel.com>
-Anup Prabhu <apra...@marvell.com>
 Anupam Kapoor <anupam.kap...@gmail.com>
+Anup Prabhu <apra...@marvell.com>
 Apeksha Gupta <apeksha.gu...@nxp.com>
 Archana Muniganti <march...@marvell.com> <muniganti.arch...@caviumnetworks.com>
 Archit Pandey <architpandeyn...@gmail.com>
@@ -143,8 +143,8 @@ Arnaud Fiorini <arnaud.fior...@polymtl.ca>
 Arnon Warshavsky <ar...@qwilt.com>
 Arshdeep Kaur <arshdeep.k...@intel.com>
 Artemii Morozov <artemii.moro...@arknetworks.am>
-Artemy Kovalyov <artem...@nvidia.com>
 Artem V. Andreev <artem.andr...@oktetlabs.ru>
+Artemy Kovalyov <artem...@nvidia.com>
 Artur Rojek <a...@semihalf.com>
 Artur Trybula <arturx.tryb...@intel.com>
 Artur Tyminski <arturx.tymin...@intel.com>
@@ -168,9 +168,9 @@ Balasubramanian Manoharan 
<balasubramanian.manoha...@caviumnetworks.com>
 Balazs Nemeth <bnem...@redhat.com> <balazs.nem...@intel.com>
 Bao-Long Tran <long...@viettel.com.vn>
 Baoyuan Li <updo...@sina.com>
-Bar Neuman <bneu...@nvidia.com>
 Barak Enat <ba...@saguna.net>
 Barbara Skobiej <barbara.skob...@intel.com>
+Bar Neuman <bneu...@nvidia.com>
 Barry Cao <barry....@nxp.com>
 Bartosz Jakub Rosadzinski <bartosz.jakub.rosadzin...@intel.com>
 Bartosz Staszewski <bartoszx.staszew...@intel.com>
@@ -195,10 +195,10 @@ Bill Hong <bh...@brocade.com>
 Bill Xiang <xiangwench...@dayudpu.com>
 Billy McFall <bmcf...@redhat.com>
 Billy O'Mahony <billy.o.mah...@intel.com>
+Bingbin Chen <chen.bing...@zte.com.cn>
 Bing Zhao <bi...@nvidia.com> <bi...@mellanox.com> <bing.z...@hxt-semitech.com>
 Bin Huang <brian.huang...@huawei.com> <bin.hu...@hxt-semitech.com>
 Bin Zheng <zhengbin.89...@bytedance.com>
-Bingbin Chen <chen.bing...@zte.com.cn>
 Björn Töpel <bjorn.to...@intel.com>
 Bo Chen <box.c.c...@intel.com>
 Boleslav Stankevich <boleslav.stankev...@oktetlabs.ru>
@@ -226,8 +226,8 @@ Carolyn Wyborny <carolyn.wybo...@intel.com>
 Chaeyong Chong <cych...@gmail.com>
 Chaitanya Babu Talluri <tallurix.chaitanya.b...@intel.com>
 Chandubabu Namburu <cha...@amd.com>
-Chang Miao <chang.m...@corigine.com>
 Changchun Ouyang <changchun.ouy...@intel.com>
+Chang Miao <chang.m...@corigine.com>
 Changpeng Liu <changpeng....@intel.com>
 Changqi Dingluo <dingluochangqi...@bytedance.com>
 Changqing Wu <changqingx...@intel.com>
@@ -246,8 +246,8 @@ Chenglian Sun <sunchengl...@loongson.cn>
 Cheng Liu <liuchen...@huawei.com>
 Cheng Peng <cheng.pe...@zte.com.cn>
 Chengwen Feng <fengcheng...@huawei.com>
-Chenmin Sun <chenmin....@intel.com>
 Chenming Chang <c...@ccm.ink>
+Chenmin Sun <chenmin....@intel.com>
 Chenxingyu Wang <wangchenxin...@huawei.com>
 Chenxu Di <chenxux...@intel.com>
 Chenyu Huang <chenyux.hu...@intel.com>
@@ -385,8 +385,8 @@ Dong Zhou <dongz...@nvidia.com> <do...@mellanox.com>
 Don Provan <dpro...@bivio.net>
 Don Wallwork <d...@xsightlabs.com>
 Doug Dziggel <douglas.a.dzig...@intel.com>
-Douglas Flint <douglas.fl...@broadcom.com>
 Doug Foster <doug.fos...@arm.com>
+Douglas Flint <douglas.fl...@broadcom.com>
 Dr. David Alan Gilbert <dgilb...@redhat.com>
 Drocula Lambda <quze...@gmail.com>
 Dror Birkman <dror.birk...@lightcyber.com>
@@ -531,8 +531,8 @@ Hanoch Haim <hh...@cisco.com>
 Hanumanth Pothula <hpoth...@marvell.com>
 Hanxiao Li <li.hanx...@zte.com.cn>
 Hao Chen <ch...@yusur.tech> <chenhao...@huawei.com>
-Hao Wu <hao...@intel.com>
 Haoqian He <haoqian...@smartx.com>
+Hao Wu <hao...@intel.com>
 Hari Kumar Vemula <hari.kumarx.vem...@intel.com>
 Harini Ramakrishnan <harini.ramakrish...@microsoft.com>
 Hariprasad Govindharajan <hariprasad.govindhara...@intel.com>
@@ -552,8 +552,8 @@ Heinrich Schuchardt <heinrich.schucha...@canonical.com>
 Helin Zhang <helin.zh...@intel.com>
 Hemant Agrawal <hemant.agra...@nxp.com> <hem...@freescale.com>
 Heng Ding <hengx.d...@intel.com>
-Hengjian Zhang <hengjianx.zh...@intel.com>
 Heng Jiang <jianghen...@huawei.com>
+Hengjian Zhang <hengjianx.zh...@intel.com>
 Hengqi Chen <hengqi.c...@gmail.com>
 Heng Wang <heng.w...@ericsson.com>
 Henning Schild <henning.sch...@siemens.com>
@@ -620,7 +620,6 @@ Ivan Dyukov <i.dyu...@samsung.com>
 Ivan Ilchenko <ivan.ilche...@oktetlabs.ru>
 Ivan Malov <ivan.ma...@arknetworks.am> <ivan.ma...@oktetlabs.ru>
 Ivan Nardi <nardi.i...@gmail.com>
-J.J. Martzki <mars14...@gmail.com>
 Jacek Bułatek <jacekx.bula...@intel.com>
 Jacek Naczyk <jacek.nac...@intel.com>
 Jacek Piasecki <jacekx.piase...@intel.com>
@@ -641,6 +640,8 @@ James Grant <j.gr...@qub.ac.uk>
 James Hershaw <james.hers...@corigine.com>
 James Poole <james.g.po...@intel.com>
 Jamie Lavigne <lavig...@amazon.com>
+Jananee Parthasarathy <jananeex.m.parthasara...@intel.com>
+Janardhanan Arumugam <janardhanan.arumu...@intel.com>
 Jan Beulich <jbeul...@suse.com>
 Jan Blunck <jblu...@infradead.org>
 Jan Medala <jan.med...@outlook.com> <j...@semihalf.com>
@@ -648,8 +649,6 @@ Jan Remes <re...@netcope.com>
 Jan Sokolowski <jan.sokolow...@intel.com>
 Jan Viktorin <vikto...@cesnet.cz> <vikto...@rehivetech.com>
 Jan Wickbom <jan.wick...@ericsson.com>
-Jananee Parthasarathy <jananeex.m.parthasara...@intel.com>
-Janardhanan Arumugam <janardhanan.arumu...@intel.com>
 Jaromír Smrček <4pla...@gmail.com>
 Jaroslaw Gawin <jaroslawx.ga...@intel.com>
 Jaroslaw Ilgiewicz <jaroslaw.ilgiew...@intel.com>
@@ -657,11 +656,11 @@ Jason He <jason...@broadcom.com>
 Jason Wang <jasow...@redhat.com>
 Jasper Tran O'Leary <jtranole...@google.com>
 Jasvinder Singh <jasvinder.si...@intel.com>
+Jayaprakash Shanmugam <jayaprakash.shanmu...@intel.com>
 Jay Ding <jay.d...@broadcom.com>
 Jay Jayatheerthan <jay.jayatheert...@intel.com>
 Jay Rolette <role...@infiniteio.com>
 Jay Zhou <jianjay.z...@huawei.com>
-Jayaprakash Shanmugam <jayaprakash.shanmu...@intel.com>
 Jean Dao <jean....@6wind.com>
 Jean-Mickael Guerin <jean-mickael.gue...@6wind.com> <j...@6wind.com>
 Jean Tourrilhes <j...@labs.hpe.com>
@@ -687,12 +686,12 @@ Jesper Wramberg <jesper.wramb...@gmail.com>
 Jesse Brandeburg <jesse.brandeb...@intel.com>
 Jesse Bruni <jesse.br...@intel.com>
 Jia He <justin...@arm.com> <jia...@hxt-semitech.com>
-Jian Wang <jianw...@trustnetic.com>
 Jianbo Liu <jianbo....@arm.com> <jianbo....@linaro.org>
 Jianfeng Tan <jianfeng....@intel.com>
-Jiang Yu <yux.ji...@intel.com>
 Jiangu Zhao <zha...@arraynetworks.com.cn>
+Jiang Yu <yux.ji...@intel.com>
 Jianping Zhao <zhao305149...@gmail.com>
+Jian Wang <jianw...@trustnetic.com>
 Jianwei Ma <jianwei...@intel.com>
 Jianwei Mei <jianweix....@intel.com>
 Jiaqi Min <jiaqix....@intel.com>
@@ -704,9 +703,9 @@ Jia Yu <j...@vmware.com>
 Jie Hai <haij...@huawei.com>
 Jie Liu <jie2....@hxt-semitech.com>
 Jie Pan <panj...@jd.com>
+Jieqiang Wang <jieqiang.w...@arm.com>
 Jie Wang <jie1x.w...@intel.com>
 Jie Zhou <j...@linux.microsoft.com> <j...@microsoft.com>
-Jieqiang Wang <jieqiang.w...@arm.com>
 Jijiang Liu <jijiang....@intel.com>
 Jilei Chen <chenji...@cmss.chinamobile.com>
 Jim Harris <james.r.har...@intel.com>
@@ -720,6 +719,7 @@ Jin Ling <jin.l...@intel.com>
 Jin Liu <jin....@corigine.com>
 Jin Yu <jin...@intel.com>
 Jiri Slaby <jsl...@suse.cz>
+J.J. Martzki <mars14...@gmail.com>
 Job Abraham <job.abra...@intel.com>
 Jochen Behrens <jochen.behr...@broadcom.com> <jbehr...@vmware.com>
 Joel Kavanagh <joel.kavan...@intel.com>
@@ -776,12 +776,12 @@ Junjie Chen <junjie.j.c...@intel.com>
 Junjie Wan <wanjun...@bytedance.com>
 Junlong Wang <wang.junlo...@zte.com.cn>
 Jun Qiu <jun....@jaguarmicro.com>
+Jun Wang <junwan...@cestc.cn>
 Jun W Zhou <junx.w.z...@intel.com>
 Junxiao Shi <g...@mail1.yoursunny.com> <sunnyla...@gmail.com>
-Jun Wang <junwan...@cestc.cn>
 Jun Yang <jun.y...@nxp.com>
-Jun Zhang <xuejun.zh...@intel.com>
 Junyu Jiang <junyux.ji...@intel.com>
+Jun Zhang <xuejun.zh...@intel.com>
 Juraj Linkeš <juraj.lin...@pantheon.tech>
 Kai Ji <kai...@intel.com>
 Kaijun Zeng <corez...@gmail.com>
@@ -1004,10 +1004,10 @@ Maxime Gouin <maxime.go...@6wind.com>
 Maxime Leroy <maxime.le...@6wind.com>
 Md Fahad Iqbal Polash <md.fahad.iqbal.pol...@intel.com>
 Megha Ajmera <megha.ajm...@intel.com>
-Menachem Fogel <menachem.fo...@intel.com>
 Meijuan Zhao <meijuanx.z...@intel.com>
 Meir Levi <mle...@marvell.com>
 Meir Tseitlin <mir...@gmail.com>
+Menachem Fogel <menachem.fo...@intel.com>
 Mesut Ali Ergin <mesut.a.er...@intel.com>
 Miao Li <miao...@intel.com>
 Michael Barker <mike...@gmail.com>
@@ -1217,8 +1217,8 @@ Peter Nilsson <peter.j.nils...@ericsson.com>
 Peter Spreadborough <peter.spreadboro...@broadcom.com>
 Petr Houska <t-peh...@microsoft.com>
 Phanendra Vukkisala <pvukkis...@marvell.com>
-Phil Yang <phil.y...@arm.com>
 Philip Prindeville <phil...@redfish-solutions.com>
+Phil Yang <phil.y...@arm.com>
 Pier Damouny <pdamo...@nvidia.com>
 Pierre Pfister <ppfis...@cisco.com>
 Pieter Jansen Van Vuuren <pieter.jansen-van-vuu...@amd.com>
@@ -1298,8 +1298,8 @@ Ray Kinsella <m...@ashroe.eu> <ray.kinse...@intel.com>
 Raz Amir <razami...@gmail.com>
 Real Valiquette <real.valique...@intel.com>
 Rebecca Troy <rebecca.t...@intel.com>
-Remi Pommarel <r...@triplefau.lt>
 Remigiusz Konca <remigiuszx.ko...@intel.com>
+Remi Pommarel <r...@triplefau.lt>
 Remy Horton <remy.hor...@intel.com>
 Renata Saiakhova <renata.saiakh...@ekinops.com>
 Renyong Wan <wa...@yunsilicon.com>
@@ -1347,8 +1347,8 @@ Rosen Xu <rosen...@altera.com> <rosen...@intel.com>
 Roy Franz <roy.fr...@cavium.com>
 Roy Pledge <roy.ple...@nxp.com>
 Roy Shterman <roy.shter...@vastdata.com>
-Rui Ferreira <rui.ferrei...@h-partners.com>
 Ruifeng Wang <ruifeng.w...@arm.com>
+Rui Ferreira <rui.ferrei...@h-partners.com>
 Rupesh Chiluka <rchil...@marvell.com>
 Rushil Gupta <rush...@google.com>
 Ryan E Hall <ryan.e.h...@intel.com>
@@ -1443,11 +1443,11 @@ Shreyansh Jain <shreyansh.j...@nxp.com>
 Shrikrishna Khare <skh...@vmware.com>
 Shuai Zhu <shuaix....@intel.com>
 Shuanglin Wang <shuanglin.w...@broadcom.com>
+Shujing Dong <shujing.d...@corigine.com>
 Shuki Katzenelson <sh...@lightbitslabs.com>
 Shun Hao <sh...@nvidia.com>
-Shu Shen <shu.s...@radisys.com>
-Shujing Dong <shujing.d...@corigine.com>
 Shuo Li <lishu...@baidu.com>
+Shu Shen <shu.s...@radisys.com>
 Shweta Choudaha <shweta.choud...@att.com>
 Shyam Kumar Shrivastav <shrivastav.sh...@gmail.com>
 Shy Shyman <s...@nvidia.com> <s...@mellanox.com>
@@ -1572,15 +1572,15 @@ Tianhao Chai <cth...@gmail.com>
 Tianjiao Liu <tianjiao....@intel.com>
 Tianli Lai <laitia...@tom.com>
 Tianyu Li <tianyu...@arm.com>
+Tim Martin <timot...@nvidia.com>
 Timmons C. Player <timmons.pla...@spirent.com>
 Timothy McDaniel <timothy.mcdan...@intel.com>
 Timothy Miskell <timothy.misk...@intel.com>
 Timothy Redaelli <tredae...@redhat.com>
-Tim Martin <timot...@nvidia.com>
 Tim Shearer <tim.shea...@overturenetworks.com>
 Ting-Kai Ku <ting-kai...@intel.com>
-Ting Xu <ting...@intel.com>
 Tingting Liao <tingtingx.l...@intel.com>
+Ting Xu <ting...@intel.com>
 Tirthendu Sarkar <tirthendu.sar...@intel.com>
 Tiwei Bie <tiwei....@intel.com> <b...@mail.ustc.edu.cn>
 Todd Fujinaka <todd.fujin...@intel.com>
@@ -1596,10 +1596,10 @@ Tomasz Wakula <tomaszx.wak...@intel.com>
 Tomasz Zawadzki <tomasz.zawad...@intel.com>
 Tom Barbette <barbe...@kth.se> <tom.barbe...@ulg.ac.be>
 Tom Crugnale <tcrugn...@sandvine.com>
+Tomer Shmilovich <tshmilov...@nvidia.com>
 Tom Jones <t...@freebsd.org>
 Tom Millington <tmilling...@solarflare.com>
 Tom Rix <t...@redhat.com>
-Tomer Shmilovich <tshmilov...@nvidia.com>
 Tone Zhang <tone.zh...@arm.com>
 Tonghao Zhang <xiangxia.m....@gmail.com> <n...@opencloud.tech>
 Tony Nguyen <anthony.l.ngu...@intel.com>
@@ -1651,8 +1651,8 @@ Vincent Jardin <vincent.jar...@6wind.com>
 Vincent Li <vincent.mc...@gmail.com>
 Vincent S. Cojot <vco...@redhat.com>
 Vinh Tran <vinh.t.tra...@gmail.com>
-Vipin Padmam Ramesh <vip...@vmware.com>
 Vinod Krishna <vinod.kris...@arm.com>
+Vipin Padmam Ramesh <vip...@vmware.com>
 Vipin Varghese <vipin.vargh...@amd.com> <vipin.vargh...@intel.com>
 Vipul Ashri <vipul.as...@oracle.com>
 Visa Hankala <v...@hankala.org>
@@ -1692,8 +1692,8 @@ Wei Wang <lny...@gmail.com>
 Wei Xie <weix....@intel.com>
 Weiyuan Li <weiyuanx...@intel.com>
 Wei Zhao <wei.zh...@intel.com>
-Wen Chiu <wc...@brocade.com>
 Wenbo Cao <caowe...@mucse.com>
+Wen Chiu <wc...@brocade.com>
 Wen-Chi Yang <wolkay...@gmail.com>
 Wenfeng Liu <li...@arraynetworks.com.cn>
 Wenjie Li <wenjiex.a...@intel.com>
@@ -1737,10 +1737,10 @@ Xiao Zhang <xiao.zh...@intel.com>
 Xieming Katty <katty.xiem...@huawei.com>
 Xinfeng Zhao <xinfengx.z...@intel.com>
 Xingguang He <xingguang...@intel.com>
-Xingyou Chen <niatlant...@gmail.com>
 Xing Wang <xing_w...@realsil.com.cn>
-Xinying Yu <xinying...@corigine.com>
+Xingyou Chen <niatlant...@gmail.com>
 Xin Long <longxin...@alibaba-inc.com>
+Xinying Yu <xinying...@corigine.com>
 Xi Zhang <xix.zh...@intel.com>
 Xuan Ding <xuan.d...@intel.com>
 Xuan Li <lixua...@hisilicon.com>
@@ -1790,8 +1790,8 @@ Yisen Zhuang <yisen.zhu...@huawei.com>
 Yixue Wang <yixue.w...@intel.com>
 Yi Yang <yangy...@inspur.com> <yi.y.y...@intel.com>
 Yi Zhang <zhang.y...@zte.com.cn>
-Yoan Picchi <yoan.pic...@arm.com>
 Yoann Desmouceaux <ydesm...@cisco.com>
+Yoan Picchi <yoan.pic...@arm.com>
 Yochai Hagvi <yochai.ha...@intel.com>
 Yogesh Bhosale <yogesh.bhos...@intel.com>
 Yogesh Jangra <yogesh.jan...@intel.com>
-- 
2.47.2

Reply via email to