According to gitmailmap manual, a line is composed of a contact information followed by commit information.
Which translates to the following formats: Proper Name <com...@email.xx> <pro...@email.xx> <com...@email.xx> Proper Name <pro...@email.xx> <com...@email.xx> Proper Name <pro...@email.xx> Commit Name <com...@email.xx> Some lines had multiple commit infos which were not parsed correctly by tools. Fix this by duplicating lines as necessary. Signed-off-by: David Marchand <david.march...@redhat.com> --- .mailmap | 92 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/.mailmap b/.mailmap index c7d55c7386..75e550e47a 100644 --- a/.mailmap +++ b/.mailmap @@ -121,10 +121,12 @@ Andrzej Ostruszka <a...@semihalf.com> <aostrus...@marvell.com> Andrzej Wilczynski <andrzejx.wilczyn...@intel.com> Andy Gospodarek <andrew.gospoda...@broadcom.com> <go...@broadcom.com> Andy Green <a...@warmcat.com> -Andy Moreton <andy.more...@amd.com> <amore...@xilinx.com> <amore...@solarflare.com> +Andy Moreton <andy.more...@amd.com> <amore...@xilinx.com> +Andy Moreton <andy.more...@amd.com> <amore...@solarflare.com> Andy Pei <andy....@intel.com> Anirudh Venkataramanan <anirudh.venkatarama...@intel.com> -Ankur Dwivedi <adwiv...@marvell.com> <ankur.dwiv...@caviumnetworks.com> <ankur.dwiv...@cavium.com> +Ankur Dwivedi <adwiv...@marvell.com> <ankur.dwiv...@caviumnetworks.com> +Ankur Dwivedi <adwiv...@marvell.com> <ankur.dwiv...@cavium.com> Anna Lukin <an...@silicom.co.il> Anoob Joseph <ano...@marvell.com> <anoob.jos...@caviumnetworks.com> Antara Ganesh Kolar <antara.ganesh.ko...@intel.com> @@ -151,7 +153,8 @@ Artur Tyminski <arturx.tymin...@intel.com> Asaf Penso <as...@nvidia.com> <as...@mellanox.com> Asaf Ravid <ara...@marvell.com> Ashijeet Acharya <ashijeet.acha...@6wind.com> -Ashish Gupta <ashi...@marvell.com> <ashish.gu...@marvell.com> <ashish.gu...@caviumnetworks.com> +Ashish Gupta <ashi...@marvell.com> <ashish.gu...@marvell.com> +Ashish Gupta <ashi...@marvell.com> <ashish.gu...@caviumnetworks.com> Ashish Jain <ashish.j...@nxp.com> Ashish Paul <ap...@juniper.net> Ashish Sadanandan <ashish.sadanan...@gmail.com> @@ -195,7 +198,8 @@ Bill Hong <bh...@brocade.com> Bill Xiang <xiangwench...@dayudpu.com> Billy McFall <bmcf...@redhat.com> Billy O'Mahony <billy.o.mah...@intel.com> -Bing Zhao <bi...@nvidia.com> <bi...@mellanox.com> <bing.z...@hxt-semitech.com> +Bing Zhao <bi...@nvidia.com> <bi...@mellanox.com> +Bing Zhao <bi...@nvidia.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> @@ -219,7 +223,9 @@ Brick Yang <brick.y...@nxp.com> Bruce Allan <bruce.w.al...@intel.com> Bruce Liu <2103458...@qq.com> Bruce Merry <bme...@sarao.ac.za> -Bruce Richardson <bruce.richard...@intel.com> <bruce.ricahrd...@intel.com> <bruce.richars...@intel.com> <bruce.ruchard...@intel.com> +Bruce Richardson <bruce.richard...@intel.com> <bruce.ricahrd...@intel.com> +Bruce Richardson <bruce.richard...@intel.com> <bruce.richars...@intel.com> +Bruce Richardson <bruce.richard...@intel.com> <bruce.ruchard...@intel.com> Bryan Benson <bmben...@amazon.com> Byron Marohn <byron.mar...@intel.com> Carolyn Wyborny <carolyn.wybo...@intel.com> @@ -236,7 +242,8 @@ Chao Zhu <chao...@linux.vnet.ibm.com> <bjz...@cn.ibm.com> Charles Brett <c...@hpe.com> Charles Myers <charles.my...@spirent.com> Charles Stoll <charles.st...@intel.com> -Chas Williams <3ch...@gmail.com> <ch...@att.com> <ciwil...@brocade.com> +Chas Williams <3ch...@gmail.com> <ch...@att.com> +Chas Williams <3ch...@gmail.com> <ciwil...@brocade.com> Chenbo Xia <chen...@nvidia.com> <chenbo....@intel.com> Chengchang Tang <tangchengch...@huawei.com> <tangchengch...@hisilicon.com> Chengfeng Ye <cy...@connect.ust.hk> @@ -323,7 +330,8 @@ Dave Ertman <david.m.ert...@intel.com> Dave Johnson <dav...@cisco.com> David Binderman <dcb...@hotmail.com> David Bouyeure <david.bouye...@fraudbuster.mobi> -David Christensen <d...@linux.ibm.com> <d...@linux.vnet.ibm.com> <david.christen...@broadcom.com> +David Christensen <d...@linux.ibm.com> <d...@linux.vnet.ibm.com> +David Christensen <d...@linux.ibm.com> <david.christen...@broadcom.com> David Coyle <david.co...@intel.com> Davide Caratti <dcara...@redhat.com> David George <david.geo...@sophos.com> @@ -441,7 +449,9 @@ Fengjiang Liu <liufengjiang.0...@bytedance.com> Fengnan Chang <changfeng...@bytedance.com> Fengtian Guo <fengtian....@6wind.com> Ferdinand Thiessen <r...@fthiessen.de> -Ferruh Yigit <ferruh.yi...@amd.com> <ferruh.yi...@intel.com> <ferruh.yi...@xilinx.com> <ferr...@gmail.com> +Ferruh Yigit <ferruh.yi...@amd.com> <ferruh.yi...@intel.com> +Ferruh Yigit <ferruh.yi...@amd.com> <ferruh.yi...@xilinx.com> +Ferruh Yigit <ferruh.yi...@amd.com> <ferr...@gmail.com> Fidaullah Noonari <fidaullah.noon...@emumba.com> Fidel Castro <fidelcastr...@hotmail.com> Fiona Trahe <fiona.tr...@intel.com> @@ -476,7 +486,8 @@ Gargi Sau <gargi....@intel.com> Gary Mussar <gmus...@ciena.com> Gaurav Singh <gaurav1...@gmail.com> Gautam Dawar <gda...@solarflare.com> -Gavin Hu <g...@nvidia.com> <gavin...@arm.com> <gavin...@linaro.org> +Gavin Hu <g...@nvidia.com> <gavin...@arm.com> +Gavin Hu <g...@nvidia.com> <gavin...@linaro.org> Gavin Li <gav...@nvidia.com> Geoffrey Le Gourriérec <geoffrey.le_gourrie...@6wind.com> Geoffrey Lv <geoffrey...@gmail.com> @@ -496,7 +507,8 @@ Gordon Noonan <gordon.noo...@intel.com> Gosia Bakota <gosia.bak...@intel.com> Govindarajulu Varadarajan <gvara...@cisco.com> Gowrishankar Muthukrishnan <gmuthukri...@marvell.com> <gowrishanka...@linux.vnet.ibm.com> -Gregory Etelson <getel...@nvidia.com> <getel...@mellanox.com> <greg...@weka.io> +Gregory Etelson <getel...@nvidia.com> <getel...@mellanox.com> +Gregory Etelson <getel...@nvidia.com> <greg...@weka.io> Greg Tucker <greg.b.tuc...@intel.com> Grishma Kotecha <grishma.kote...@intel.com> Grzegorz Galkowski <grzegorz.galkow...@intel.com> @@ -632,7 +644,8 @@ Jakub Buchocki <jakubx.bucho...@intel.com> Jakub Chylkowski <jakubx.chylkow...@intel.com> Jakub Grajciar <jgraj...@cisco.com> Jakub Neruda <ner...@netcope.com> -Jakub Palider <jpali...@marvell.com> <j...@semihalf.com> <jpali...@gmail.com> +Jakub Palider <jpali...@marvell.com> <j...@semihalf.com> +Jakub Palider <jpali...@marvell.com> <jpali...@gmail.com> Jakub Poczatek <jakub.pocza...@intel.com> Jakub Wysocki <jakubx.wyso...@intel.com> James Davidson <james.david...@brocade.com> @@ -676,7 +689,8 @@ Jeff Shaw <jeffrey.b.s...@intel.com> Jens Freimann <jfreim...@redhat.com> <jfrei...@redhat.com> Jeremy Plsek <jpl...@iol.unh.edu> Jeremy Spewock <jspew...@iol.unh.edu> -Jerin Jacob <jer...@marvell.com> <jerin.ja...@caviumnetworks.com> <jerinjac...@gmail.com> +Jerin Jacob <jer...@marvell.com> <jerin.ja...@caviumnetworks.com> +Jerin Jacob <jer...@marvell.com> <jerinjac...@gmail.com> Jeroen de Borst <jeroe...@google.com> Jerome Jutteau <jerome.jutt...@outscale.com> Jerry Hao OS <jerry...@os.amperecomputing.com> @@ -744,7 +758,8 @@ John Ousterhout <ous...@cs.stanford.edu> John Romein <rom...@astron.nl> John W. Linville <linvi...@tuxdriver.com> Jonas Pfefferle <j...@zurich.ibm.com> <peppe...@japf.ch> -Jonathan Erb <jonathan....@threater.com> <jonathan....@threatblockr.com> <jonathan....@banduracyber.com> +Jonathan Erb <jonathan....@threater.com> <jonathan....@threatblockr.com> +Jonathan Erb <jonathan....@threater.com> <jonathan....@banduracyber.com> Jonathan Tsai <jonathan1.t...@intel.com> Jon DeVree <n...@vault24.org> Jon Loeliger <j...@netgate.com> @@ -821,14 +836,16 @@ Ke Zhang <ke1x.zh...@intel.com> Khadem Ullah <14pwcse1...@uetpeshawar.edu.pk> Khoa To <k...@microsoft.com> Kiran KN <kira...@juniper.net> -Kiran Kumar K <kirankum...@marvell.com> <kkokkilaga...@caviumnetworks.com> <kiran.kokkilaga...@caviumnetworks.com> +Kiran Kumar K <kirankum...@marvell.com> <kkokkilaga...@caviumnetworks.com> +Kiran Kumar K <kirankum...@marvell.com> <kiran.kokkilaga...@caviumnetworks.com> Kiran Patil <kiran.pa...@intel.com> Kiran Vedere <kir...@nvidia.com> Kirill Rybalchenko <kirill.rybalche...@intel.com> Kishore Padmanabha <kishore.padmana...@broadcom.com> Klaus Degner <k...@allegro-packets.com> Kommula Shiva Shankar <kshan...@marvell.com> -Konstantin Ananyev <konstantin.anan...@huawei.com> <konstantin.v.anan...@yandex.ru> <konstantin.anan...@intel.com> +Konstantin Ananyev <konstantin.anan...@huawei.com> <konstantin.v.anan...@yandex.ru> +Konstantin Ananyev <konstantin.anan...@huawei.com> <konstantin.anan...@intel.com> Krishna Murthy <krishna.j.mur...@intel.com> Krzysztof Galazka <krzysztof.gala...@intel.com> Krzysztof Kanas <kka...@marvell.com> <krzysztof.ka...@caviumnetworks.com> @@ -861,7 +878,8 @@ Lev Faerman <lev.faer...@intel.com> Lewei Yang <leweix.y...@intel.com> Lewis Donzis <l...@perftech.com> Leyi Rong <leyi.r...@intel.com> -Liang Ma <lian...@bytedance.com> <lian...@liangbit.com> <liang.j...@intel.com> +Liang Ma <lian...@bytedance.com> <lian...@liangbit.com> +Liang Ma <lian...@bytedance.com> <liang.j...@intel.com> Liang-Min Larry Wang <liang-min.w...@intel.com> Liangxing Wang <liangxing.w...@arm.com> Liang Xu <liang...@cinfotech.cn> @@ -891,7 +909,10 @@ Lotem Leder <lotem.le...@intel.com> Louise Kilheeney <louise.kilhee...@intel.com> Louis Luo <llo...@vmware.com> Louis Peens <louis.pe...@corigine.com> <louis.pe...@netronome.com> -Luca Boccassi <luca.bocca...@microsoft.com> <bl...@debian.org> <luca.bocca...@gmail.com> <lbocc...@brocade.com> <luca.bocca...@intl.att.com> +Luca Boccassi <luca.bocca...@microsoft.com> <bl...@debian.org> +Luca Boccassi <luca.bocca...@microsoft.com> <luca.bocca...@gmail.com> +Luca Boccassi <luca.bocca...@microsoft.com> <lbocc...@brocade.com> +Luca Boccassi <luca.bocca...@microsoft.com> <luca.bocca...@intl.att.com> Luca Vizzarro <luca.vizza...@arm.com> Luc Pelletier <lucp.at.w...@gmail.com> Luka Jankovic <luka.janko...@ericsson.com> @@ -1093,7 +1114,8 @@ Nan Chen <whutchen...@gmail.com> Nandini Persad <nandinipersad...@gmail.com> Nannan Lu <nannan...@intel.com> Nan Zhou <zhouna...@huawei.com> -Narcisa Vasile <navas...@linux.microsoft.com> <navas...@microsoft.com> <narcisa.vas...@microsoft.com> +Narcisa Vasile <navas...@linux.microsoft.com> <navas...@microsoft.com> +Narcisa Vasile <navas...@linux.microsoft.com> <narcisa.vas...@microsoft.com> Narender Vangati <narender.vang...@intel.com> Naresh Kumar PBS <nareshkumar....@broadcom.com> Natalie Samsonov <nsams...@marvell.com> @@ -1167,7 +1189,8 @@ Padraig Connolly <padraig.j.conno...@intel.com> Pallantla Poornima <pallantlax.poorn...@intel.com> Pallavi Kadam <pallavi.ka...@intel.com> Pandi Kumar Maharajan <pandi.mahara...@intel.com> -Pankaj Gupta <pankaj.gu...@broadcom.com> <pagu...@vmware.com> <pagu...@redhat.com> +Pankaj Gupta <pankaj.gu...@broadcom.com> <pagu...@vmware.com> +Pankaj Gupta <pankaj.gu...@broadcom.com> <pagu...@redhat.com> Panu Matilainen <pmati...@redhat.com> Paolo Valerio <pvale...@redhat.com> Parav Pandit <pa...@nvidia.com> <pa...@mellanox.com> @@ -1201,7 +1224,8 @@ Pawel Malinowski <pawel.malinow...@intel.com> Pawel Modrak <pawelx.mod...@intel.com> Pawel Rutkowski <pawelx.rutkow...@intel.com> Pawel Sobczyk <pawel.sobc...@intel.com> -Pawel Wodkowski <pawel...@gmail.com> <pawelx.wodkow...@intel.com> <pawelx.wdkow...@intel.com> +Pawel Wodkowski <pawel...@gmail.com> <pawelx.wodkow...@intel.com> +Pawel Wodkowski <pawel...@gmail.com> <pawelx.wdkow...@intel.com> Pei Chao <peicha...@gmail.com> Pei Zhang <pezh...@redhat.com> Pengfei Sun <sunpengfe...@huawei.com> @@ -1282,13 +1306,16 @@ Rajesh Mudimadugula <rmudimadu...@marvell.com> Rajesh Ravi <rajesh.r...@broadcom.com> Rakesh Kudurumalla <rkuduruma...@marvell.com> <rkuduruma...@caviumnetworks.com> Ralf Hoffmann <ralf.hoffm...@allegro-packets.com> -Rami Rosen <ramir...@gmail.com> <rami.ro...@intel.com> <roszenr...@gmail.com> +Rami Rosen <ramir...@gmail.com> <rami.ro...@intel.com> +Rami Rosen <ramir...@gmail.com> <roszenr...@gmail.com> Randy Schacher <stuart.schac...@broadcom.com> Rani Sharoni <ran...@nvidia.com> Ranjit Menon <ranjit.me...@intel.com> -Rasesh Mody <rm...@marvell.com> <rasesh.m...@cavium.com> <rasesh.m...@qlogic.com> +Rasesh Mody <rm...@marvell.com> <rasesh.m...@cavium.com> +Rasesh Mody <rm...@marvell.com> <rasesh.m...@qlogic.com> Rashmi Shetty <rashmi.she...@intel.com> -Raslan Darawsheh <rasl...@nvidia.com> <rasl...@mellanox.com> <rdaraws...@asaltech.com> +Raslan Darawsheh <rasl...@nvidia.com> <rasl...@mellanox.com> +Raslan Darawsheh <rasl...@nvidia.com> <rdaraws...@asaltech.com> Rastislav Cernay <cer...@netcope.com> Raveendra Padasalagi <raveendra.padasal...@broadcom.com> Ravi Kerur <rke...@brocade.com> <rke...@gmail.com> @@ -1309,14 +1336,16 @@ Ricardo Salveti <ricardo.salv...@linaro.org> Richael Zhuang <richael.zhu...@arm.com> Richard Donkin <richard.don...@corigine.com> Richard Eklycke <richard.ekly...@ericsson.com> -Richard Houldsworth <richard.houldswo...@amd.com> <rhoul...@xilinx.com> <rhouldswo...@solarflare.com> +Richard Houldsworth <richard.houldswo...@amd.com> <rhoul...@xilinx.com> +Richard Houldsworth <richard.houldswo...@amd.com> <rhouldswo...@solarflare.com> Richard Walsh <richard.wa...@intel.com> Rich Lane <rich.l...@bigswitch.com> Ricky Li <ricky...@intel.com> R Mohamed Shah <mohamedsha...@amd.com> Robert Konklewski <robertx.konklew...@intel.com> Robert Malz <robertx.m...@intel.com> -Robert Sanford <rsanf...@akamai.com> <rsanfo...@gmail.com> <rsanf...@prolexic.com> +Robert Sanford <rsanf...@akamai.com> <rsanfo...@gmail.com> +Robert Sanford <rsanf...@akamai.com> <rsanf...@prolexic.com> Robert Shearman <rshea...@brocade.com> Robert Stonehouse <rstoneho...@solarflare.com> Robin Jarry <rja...@redhat.com> <robin.ja...@6wind.com> @@ -1498,7 +1527,9 @@ Stefan Wegrzyn <stefan.wegr...@intel.com> Stepan Sojka <stepan.so...@adaptivemobile.com> Stephen Coleman <omegacole...@gmail.com> Stephen Douthit <steph...@silicom-usa.com> -Stephen Hemminger <step...@networkplumber.org> <sthem...@microsoft.com> <shemm...@brocade.com> <shemmin...@vyatta.com> +Stephen Hemminger <step...@networkplumber.org> <sthem...@microsoft.com> +Stephen Hemminger <step...@networkplumber.org> <shemm...@brocade.com> +Stephen Hemminger <step...@networkplumber.org> <shemmin...@vyatta.com> Stephen Hurd <stephen.h...@broadcom.com> <sh...@broadcom.com> Steve Capper <steve.cap...@arm.com> Steven Lariau <steven.lar...@arm.com> @@ -1509,7 +1540,8 @@ Steve Rempe <steve.re...@broadcom.com> Steve Shin <jons...@cisco.com> Steve Yang <stevex.y...@intel.com> Stewart Allen <allen...@amazon.com> -Suanming Mou <suanmi...@nvidia.com> <suanmi...@mellanox.com> <mousuanm...@huawei.com> +Suanming Mou <suanmi...@nvidia.com> <suanmi...@mellanox.com> +Suanming Mou <suanmi...@nvidia.com> <mousuanm...@huawei.com> Subendu Santra <sube...@arista.com> Subhi Masri <sub...@nvidia.com> Subrahmanyam Nilla <sni...@marvell.com> <sni...@caviumnetworks.com> @@ -1518,7 +1550,8 @@ Sudheer Mogilappagari <sudheer.mogilappag...@intel.com> Sujith Sankar <ssuj...@cisco.com> Sunila Sahu <ss...@marvell.com> <sunila.s...@caviumnetworks.com> Sunil Kulkarni <sunil.kulka...@caviumnetworks.com> -Sunil Kumar Kori <sk...@marvell.com> <sk...@mavell.com> <sunil.k...@nxp.com> +Sunil Kumar Kori <sk...@marvell.com> <sk...@mavell.com> +Sunil Kumar Kori <sk...@marvell.com> <sunil.k...@nxp.com> Sunil Pai G <sunil.pa...@intel.com> Sunil Uttarwar <sunilprakashrao.uttar...@amd.com> Sun Jiajia <sunx.jia...@intel.com> @@ -1860,4 +1893,5 @@ Ziyang Xuan <xuanziya...@huawei.com> Ziye Yang <ziye.y...@intel.com> Zoltan Kiss <zoltan.k...@schaman.hu> <zoltan.k...@linaro.org> Zorik Machulsky <zo...@amazon.com> -Zyta Szpak <z...@marvell.com> <z...@semihalf.com> <zyta.sz...@semihalf.com> +Zyta Szpak <z...@marvell.com> <z...@semihalf.com> +Zyta Szpak <z...@marvell.com> <zyta.sz...@semihalf.com> -- 2.50.0
