[PATCH] mailmap: fix entries with many aliases

[David Marchand]

According to gitmailmap manual, a line is composed of a contact
information followed by commit information.

Which translates to the following formats:
Proper Name <commit at email.xx>
<proper at email.xx> <commit at email.xx>
Proper Name <proper at email.xx> <commit at email.xx>
Proper Name <proper at email.xx> Commit Name <commit at 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.marchand at 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 <amo at semihalf.com> <aostruszka at marvell.com>
 Andrzej Wilczynski <andrzejx.wilczynski at intel.com>
 Andy Gospodarek <andrew.gospodarek at broadcom.com> <gospo at broadcom.com>
 Andy Green <andy at warmcat.com>
-Andy Moreton <andy.moreton at amd.com> <amoreton at xilinx.com> <amoreton at solarflare.com>
+Andy Moreton <andy.moreton at amd.com> <amoreton at xilinx.com>
+Andy Moreton <andy.moreton at amd.com> <amoreton at solarflare.com>
 Andy Pei <andy.pei at intel.com>
 Anirudh Venkataramanan <anirudh.venkataramanan at intel.com>
-Ankur Dwivedi <adwivedi at marvell.com> <ankur.dwivedi at caviumnetworks.com> <ankur.dwivedi at cavium.com>
+Ankur Dwivedi <adwivedi at marvell.com> <ankur.dwivedi at caviumnetworks.com>
+Ankur Dwivedi <adwivedi at marvell.com> <ankur.dwivedi at cavium.com>
 Anna Lukin <annal at silicom.co.il>
 Anoob Joseph <anoobj at marvell.com> <anoob.joseph at caviumnetworks.com>
 Antara Ganesh Kolar <antara.ganesh.kolar at intel.com>
@@ -151,7 +153,8 @@ Artur Tyminski <arturx.tyminski at intel.com>
 Asaf Penso <asafp at nvidia.com> <asafp at mellanox.com>
 Asaf Ravid <aravid at marvell.com>
 Ashijeet Acharya <ashijeet.acharya at 6wind.com>
-Ashish Gupta <ashishg at marvell.com> <ashish.gupta at marvell.com> <ashish.gupta at caviumnetworks.com>
+Ashish Gupta <ashishg at marvell.com> <ashish.gupta at marvell.com>
+Ashish Gupta <ashishg at marvell.com> <ashish.gupta at caviumnetworks.com>
 Ashish Jain <ashish.jain at nxp.com>
 Ashish Paul <apaul at juniper.net>
 Ashish Sadanandan <ashish.sadanandan at gmail.com>
@@ -195,7 +198,8 @@ Bill Hong <bhong at brocade.com>
 Bill Xiang <xiangwencheng at dayudpu.com>
 Billy McFall <bmcfall at redhat.com>
 Billy O'Mahony <billy.o.mahony at intel.com>
-Bing Zhao <bingz at nvidia.com> <bingz at mellanox.com> <bing.zhao at hxt-semitech.com>
+Bing Zhao <bingz at nvidia.com> <bingz at mellanox.com>
+Bing Zhao <bingz at nvidia.com> <bing.zhao at hxt-semitech.com>
 Bin Huang <brian.huangbin at huawei.com> <bin.huang at hxt-semitech.com>
 Bin Zheng <zhengbin.89740 at bytedance.com>
 Bingbin Chen <chen.bingbin at zte.com.cn>
@@ -219,7 +223,9 @@ Brick Yang <brick.yang at nxp.com>
 Bruce Allan <bruce.w.allan at intel.com>
 Bruce Liu <2103458176 at qq.com>
 Bruce Merry <bmerry at sarao.ac.za>
-Bruce Richardson <bruce.richardson at intel.com> <bruce.ricahrdson at intel.com> <bruce.richarsdon at intel.com> <bruce.ruchardson at intel.com>
+Bruce Richardson <bruce.richardson at intel.com> <bruce.ricahrdson at intel.com>
+Bruce Richardson <bruce.richardson at intel.com> <bruce.richarsdon at intel.com>
+Bruce Richardson <bruce.richardson at intel.com> <bruce.ruchardson at intel.com>
 Bryan Benson <bmbenson at amazon.com>
 Byron Marohn <byron.marohn at intel.com>
 Carolyn Wyborny <carolyn.wyborny at intel.com>
@@ -236,7 +242,8 @@ Chao Zhu <chaozhu at linux.vnet.ibm.com> <bjzhuc at cn.ibm.com>
 Charles Brett <cfb at hpe.com>
 Charles Myers <charles.myers at spirent.com>
 Charles Stoll <charles.stoll at intel.com>
-Chas Williams <3chas3 at gmail.com> <chas3 at att.com> <ciwillia at brocade.com>
+Chas Williams <3chas3 at gmail.com> <chas3 at att.com>
+Chas Williams <3chas3 at gmail.com> <ciwillia at brocade.com>
 Chenbo Xia <chenbox at nvidia.com> <chenbo.xia at intel.com>
 Chengchang Tang <tangchengchang at huawei.com> <tangchengchang at hisilicon.com>
 Chengfeng Ye <cyeaa at connect.ust.hk>
@@ -323,7 +330,8 @@ Dave Ertman <david.m.ertman at intel.com>
 Dave Johnson <davejo at cisco.com>
 David Binderman <dcb314 at hotmail.com>
 David Bouyeure <david.bouyeure at fraudbuster.mobi>
-David Christensen <drc at linux.ibm.com> <drc at linux.vnet.ibm.com> <david.christensen at broadcom.com>
+David Christensen <drc at linux.ibm.com> <drc at linux.vnet.ibm.com>
+David Christensen <drc at linux.ibm.com> <david.christensen at broadcom.com>
 David Coyle <david.coyle at intel.com>
 Davide Caratti <dcaratti at redhat.com>
 David George <david.george at sophos.com>
@@ -441,7 +449,9 @@ Fengjiang Liu <liufengjiang.0426 at bytedance.com>
 Fengnan Chang <changfengnan at bytedance.com>
 Fengtian Guo <fengtian.guo at 6wind.com>
 Ferdinand Thiessen <rpm at fthiessen.de>
-Ferruh Yigit <ferruh.yigit at amd.com> <ferruh.yigit at intel.com> <ferruh.yigit at xilinx.com> <ferruhy at gmail.com>
+Ferruh Yigit <ferruh.yigit at amd.com> <ferruh.yigit at intel.com>
+Ferruh Yigit <ferruh.yigit at amd.com> <ferruh.yigit at xilinx.com>
+Ferruh Yigit <ferruh.yigit at amd.com> <ferruhy at gmail.com>
 Fidaullah Noonari <fidaullah.noonari at emumba.com>
 Fidel Castro <fidelcastro.s at hotmail.com>
 Fiona Trahe <fiona.trahe at intel.com>
@@ -476,7 +486,8 @@ Gargi Sau <gargi.sau at intel.com>
 Gary Mussar <gmussar at ciena.com>
 Gaurav Singh <gaurav1086 at gmail.com>
 Gautam Dawar <gdawar at solarflare.com>
-Gavin Hu <gahu at nvidia.com> <gavin.hu at arm.com> <gavin.hu at linaro.org>
+Gavin Hu <gahu at nvidia.com> <gavin.hu at arm.com>
+Gavin Hu <gahu at nvidia.com> <gavin.hu at linaro.org>
 Gavin Li <gavinl at nvidia.com>
 Geoffrey Le Gourriérec <geoffrey.le_gourrierec at 6wind.com>
 Geoffrey Lv <geoffrey.lv at gmail.com>
@@ -496,7 +507,8 @@ Gordon Noonan <gordon.noonan at intel.com>
 Gosia Bakota <gosia.bakota at intel.com>
 Govindarajulu Varadarajan <gvaradar at cisco.com>
 Gowrishankar Muthukrishnan <gmuthukrishn at marvell.com> <gowrishankar.m at linux.vnet.ibm.com>
-Gregory Etelson <getelson at nvidia.com> <getelson at mellanox.com> <gregory at weka.io>
+Gregory Etelson <getelson at nvidia.com> <getelson at mellanox.com>
+Gregory Etelson <getelson at nvidia.com> <gregory at weka.io>
 Greg Tucker <greg.b.tucker at intel.com>
 Grishma Kotecha <grishma.kotecha at intel.com>
 Grzegorz Galkowski <grzegorz.galkowski at intel.com>
@@ -632,7 +644,8 @@ Jakub Buchocki <jakubx.buchocki at intel.com>
 Jakub Chylkowski <jakubx.chylkowski at intel.com>
 Jakub Grajciar <jgrajcia at cisco.com>
 Jakub Neruda <neruda at netcope.com>
-Jakub Palider <jpalider at marvell.com> <jpa at semihalf.com> <jpalider at gmail.com>
+Jakub Palider <jpalider at marvell.com> <jpa at semihalf.com>
+Jakub Palider <jpalider at marvell.com> <jpalider at gmail.com>
 Jakub Poczatek <jakub.poczatek at intel.com>
 Jakub Wysocki <jakubx.wysocki at intel.com>
 James Davidson <james.davidson at brocade.com>
@@ -676,7 +689,8 @@ Jeff Shaw <jeffrey.b.shaw at intel.com>
 Jens Freimann <jfreimann at redhat.com> <jfreiman at redhat.com>
 Jeremy Plsek <jplsek at iol.unh.edu>
 Jeremy Spewock <jspewock at iol.unh.edu>
-Jerin Jacob <jerinj at marvell.com> <jerin.jacob at caviumnetworks.com> <jerinjacobk at gmail.com>
+Jerin Jacob <jerinj at marvell.com> <jerin.jacob at caviumnetworks.com>
+Jerin Jacob <jerinj at marvell.com> <jerinjacobk at gmail.com>
 Jeroen de Borst <jeroendb at google.com>
 Jerome Jutteau <jerome.jutteau at outscale.com>
 Jerry Hao OS <jerryhao at os.amperecomputing.com>
@@ -744,7 +758,8 @@ John Ousterhout <ouster at cs.stanford.edu>
 John Romein <romein at astron.nl>
 John W. Linville <linville at tuxdriver.com>
 Jonas Pfefferle <jpf at zurich.ibm.com> <pepperjo at japf.ch>
-Jonathan Erb <jonathan.erb at threater.com> <jonathan.erb at threatblockr.com> <jonathan.erb at banduracyber.com>
+Jonathan Erb <jonathan.erb at threater.com> <jonathan.erb at threatblockr.com>
+Jonathan Erb <jonathan.erb at threater.com> <jonathan.erb at banduracyber.com>
 Jonathan Tsai <jonathan1.tsai at intel.com>
 Jon DeVree <nuxi at vault24.org>
 Jon Loeliger <jdl at netgate.com>
@@ -821,14 +836,16 @@ Ke Zhang <ke1x.zhang at intel.com>
 Khadem Ullah <14pwcse1224 at uetpeshawar.edu.pk>
 Khoa To <khot at microsoft.com>
 Kiran KN <kirankn at juniper.net>
-Kiran Kumar K <kirankumark at marvell.com> <kkokkilagadda at caviumnetworks.com> <kiran.kokkilagadda at caviumnetworks.com>
+Kiran Kumar K <kirankumark at marvell.com> <kkokkilagadda at caviumnetworks.com>
+Kiran Kumar K <kirankumark at marvell.com> <kiran.kokkilagadda at caviumnetworks.com>
 Kiran Patil <kiran.patil at intel.com>
 Kiran Vedere <kiranv at nvidia.com>
 Kirill Rybalchenko <kirill.rybalchenko at intel.com>
 Kishore Padmanabha <kishore.padmanabha at broadcom.com>
 Klaus Degner <kd at allegro-packets.com>
 Kommula Shiva Shankar <kshankar at marvell.com>
-Konstantin Ananyev <konstantin.ananyev at huawei.com> <konstantin.v.ananyev at yandex.ru> <konstantin.ananyev at intel.com>
+Konstantin Ananyev <konstantin.ananyev at huawei.com> <konstantin.v.ananyev at yandex.ru>
+Konstantin Ananyev <konstantin.ananyev at huawei.com> <konstantin.ananyev at intel.com>
 Krishna Murthy <krishna.j.murthy at intel.com>
 Krzysztof Galazka <krzysztof.galazka at intel.com>
 Krzysztof Kanas <kkanas at marvell.com> <krzysztof.kanas at caviumnetworks.com>
@@ -861,7 +878,8 @@ Lev Faerman <lev.faerman at intel.com>
 Lewei Yang <leweix.yang at intel.com>
 Lewis Donzis <lew at perftech.com>
 Leyi Rong <leyi.rong at intel.com>
-Liang Ma <liangma at bytedance.com> <liangma at liangbit.com> <liang.j.ma at intel.com>
+Liang Ma <liangma at bytedance.com> <liangma at liangbit.com>
+Liang Ma <liangma at bytedance.com> <liang.j.ma at intel.com>
 Liang-Min Larry Wang <liang-min.wang at intel.com>
 Liangxing Wang <liangxing.wang at arm.com>
 Liang Xu <liang.xu at cinfotech.cn>
@@ -891,7 +909,10 @@ Lotem Leder <lotem.leder at intel.com>
 Louise Kilheeney <louise.kilheeney at intel.com>
 Louis Luo <llouis at vmware.com>
 Louis Peens <louis.peens at corigine.com> <louis.peens at netronome.com>
-Luca Boccassi <luca.boccassi at microsoft.com> <bluca at debian.org> <luca.boccassi at gmail.com> <lboccass at brocade.com> <luca.boccassi at intl.att.com>
+Luca Boccassi <luca.boccassi at microsoft.com> <bluca at debian.org>
+Luca Boccassi <luca.boccassi at microsoft.com> <luca.boccassi at gmail.com>
+Luca Boccassi <luca.boccassi at microsoft.com> <lboccass at brocade.com>
+Luca Boccassi <luca.boccassi at microsoft.com> <luca.boccassi at intl.att.com>
 Luca Vizzarro <luca.vizzarro at arm.com>
 Luc Pelletier <lucp.at.work at gmail.com>
 Luka Jankovic <luka.jankovic at ericsson.com>
@@ -1093,7 +1114,8 @@ Nan Chen <whutchennan at gmail.com>
 Nandini Persad <nandinipersad361 at gmail.com>
 Nannan Lu <nannan.lu at intel.com>
 Nan Zhou <zhounan14 at huawei.com>
-Narcisa Vasile <navasile at linux.microsoft.com> <navasile at microsoft.com> <narcisa.vasile at microsoft.com>
+Narcisa Vasile <navasile at linux.microsoft.com> <navasile at microsoft.com>
+Narcisa Vasile <navasile at linux.microsoft.com> <narcisa.vasile at microsoft.com>
 Narender Vangati <narender.vangati at intel.com>
 Naresh Kumar PBS <nareshkumar.pbs at broadcom.com>
 Natalie Samsonov <nsamsono at marvell.com>
@@ -1167,7 +1189,8 @@ Padraig Connolly <padraig.j.connolly at intel.com>
 Pallantla Poornima <pallantlax.poornima at intel.com>
 Pallavi Kadam <pallavi.kadam at intel.com>
 Pandi Kumar Maharajan <pandi.maharajan at intel.com>
-Pankaj Gupta <pankaj.gupta at broadcom.com> <pagupta at vmware.com> <pagupta at redhat.com>
+Pankaj Gupta <pankaj.gupta at broadcom.com> <pagupta at vmware.com>
+Pankaj Gupta <pankaj.gupta at broadcom.com> <pagupta at redhat.com>
 Panu Matilainen <pmatilai at redhat.com>
 Paolo Valerio <pvalerio at redhat.com>
 Parav Pandit <parav at nvidia.com> <parav at mellanox.com>
@@ -1201,7 +1224,8 @@ Pawel Malinowski <pawel.malinowski at intel.com>
 Pawel Modrak <pawelx.modrak at intel.com>
 Pawel Rutkowski <pawelx.rutkowski at intel.com>
 Pawel Sobczyk <pawel.sobczyk at intel.com>
-Pawel Wodkowski <pawelwod at gmail.com> <pawelx.wodkowski at intel.com> <pawelx.wdkowski at intel.com>
+Pawel Wodkowski <pawelwod at gmail.com> <pawelx.wodkowski at intel.com>
+Pawel Wodkowski <pawelwod at gmail.com> <pawelx.wdkowski at intel.com>
 Pei Chao <peichao85 at gmail.com>
 Pei Zhang <pezhang at redhat.com>
 Pengfei Sun <sunpengfei16 at huawei.com>
@@ -1282,13 +1306,16 @@ Rajesh Mudimadugula <rmudimadugul at marvell.com>
 Rajesh Ravi <rajesh.ravi at broadcom.com>
 Rakesh Kudurumalla <rkudurumalla at marvell.com> <rkudurumalla at caviumnetworks.com>
 Ralf Hoffmann <ralf.hoffmann at allegro-packets.com>
-Rami Rosen <ramirose at gmail.com> <rami.rosen at intel.com> <roszenrami at gmail.com>
+Rami Rosen <ramirose at gmail.com> <rami.rosen at intel.com>
+Rami Rosen <ramirose at gmail.com> <roszenrami at gmail.com>
 Randy Schacher <stuart.schacher at broadcom.com>
 Rani Sharoni <ranish at nvidia.com>
 Ranjit Menon <ranjit.menon at intel.com>
-Rasesh Mody <rmody at marvell.com> <rasesh.mody at cavium.com> <rasesh.mody at qlogic.com>
+Rasesh Mody <rmody at marvell.com> <rasesh.mody at cavium.com>
+Rasesh Mody <rmody at marvell.com> <rasesh.mody at qlogic.com>
 Rashmi Shetty <rashmi.shetty at intel.com>
-Raslan Darawsheh <rasland at nvidia.com> <rasland at mellanox.com> <rdarawsheh at asaltech.com>
+Raslan Darawsheh <rasland at nvidia.com> <rasland at mellanox.com>
+Raslan Darawsheh <rasland at nvidia.com> <rdarawsheh at asaltech.com>
 Rastislav Cernay <cernay at netcope.com>
 Raveendra Padasalagi <raveendra.padasalagi at broadcom.com>
 Ravi Kerur <rkerur at brocade.com> <rkerur at gmail.com>
@@ -1309,14 +1336,16 @@ Ricardo Salveti <ricardo.salveti at linaro.org>
 Richael Zhuang <richael.zhuang at arm.com>
 Richard Donkin <richard.donkin at corigine.com>
 Richard Eklycke <richard.eklycke at ericsson.com>
-Richard Houldsworth <richard.houldsworth at amd.com> <rhouldsw at xilinx.com> <rhouldsworth at solarflare.com>
+Richard Houldsworth <richard.houldsworth at amd.com> <rhouldsw at xilinx.com>
+Richard Houldsworth <richard.houldsworth at amd.com> <rhouldsworth at solarflare.com>
 Richard Walsh <richard.walsh at intel.com>
 Rich Lane <rich.lane at bigswitch.com>
 Ricky Li <ricky.li at intel.com>
 R Mohamed Shah <mohamedshah.r at amd.com>
 Robert Konklewski <robertx.konklewski at intel.com>
 Robert Malz <robertx.malz at intel.com>
-Robert Sanford <rsanford at akamai.com> <rsanford2 at gmail.com> <rsanford at prolexic.com>
+Robert Sanford <rsanford at akamai.com> <rsanford2 at gmail.com>
+Robert Sanford <rsanford at akamai.com> <rsanford at prolexic.com>
 Robert Shearman <rshearma at brocade.com>
 Robert Stonehouse <rstonehouse at solarflare.com>
 Robin Jarry <rjarry at redhat.com> <robin.jarry at 6wind.com>
@@ -1498,7 +1527,9 @@ Stefan Wegrzyn <stefan.wegrzyn at intel.com>
 Stepan Sojka <stepan.sojka at adaptivemobile.com>
 Stephen Coleman <omegacoleman at gmail.com>
 Stephen Douthit <stephend at silicom-usa.com>
-Stephen Hemminger <stephen at networkplumber.org> <sthemmin at microsoft.com> <shemming at brocade.com> <shemminger at vyatta.com>
+Stephen Hemminger <stephen at networkplumber.org> <sthemmin at microsoft.com>
+Stephen Hemminger <stephen at networkplumber.org> <shemming at brocade.com>
+Stephen Hemminger <stephen at networkplumber.org> <shemminger at vyatta.com>
 Stephen Hurd <stephen.hurd at broadcom.com> <shurd at broadcom.com>
 Steve Capper <steve.capper at arm.com>
 Steven Lariau <steven.lariau at arm.com>
@@ -1509,7 +1540,8 @@ Steve Rempe <steve.rempe at broadcom.com>
 Steve Shin <jonshin at cisco.com>
 Steve Yang <stevex.yang at intel.com>
 Stewart Allen <allenste at amazon.com>
-Suanming Mou <suanmingm at nvidia.com> <suanmingm at mellanox.com> <mousuanming at huawei.com>
+Suanming Mou <suanmingm at nvidia.com> <suanmingm at mellanox.com>
+Suanming Mou <suanmingm at nvidia.com> <mousuanming at huawei.com>
 Subendu Santra <subendu at arista.com>
 Subhi Masri <subhim at nvidia.com>
 Subrahmanyam Nilla <snilla at marvell.com> <snilla at caviumnetworks.com>
@@ -1518,7 +1550,8 @@ Sudheer Mogilappagari <sudheer.mogilappagari at intel.com>
 Sujith Sankar <ssujith at cisco.com>
 Sunila Sahu <ssahu at marvell.com> <sunila.sahu at caviumnetworks.com>
 Sunil Kulkarni <sunil.kulkarni at caviumnetworks.com>
-Sunil Kumar Kori <skori at marvell.com> <skori at mavell.com> <sunil.kori at nxp.com>
+Sunil Kumar Kori <skori at marvell.com> <skori at mavell.com>
+Sunil Kumar Kori <skori at marvell.com> <sunil.kori at nxp.com>
 Sunil Pai G <sunil.pai.g at intel.com>
 Sunil Uttarwar <sunilprakashrao.uttarwar at amd.com>
 Sun Jiajia <sunx.jiajia at intel.com>
@@ -1860,4 +1893,5 @@ Ziyang Xuan <xuanziyang2 at huawei.com>
 Ziye Yang <ziye.yang at intel.com>
 Zoltan Kiss <zoltan.kiss at schaman.hu> <zoltan.kiss at linaro.org>
 Zorik Machulsky <zorik at amazon.com>
-Zyta Szpak <zyta at marvell.com> <zr at semihalf.com> <zyta.szpak at semihalf.com>
+Zyta Szpak <zyta at marvell.com> <zr at semihalf.com>
+Zyta Szpak <zyta at marvell.com> <zyta.szpak at semihalf.com>
-- 
2.50.0