[PATCH] mailmap: clean up vmware entries

[Jochen Behrens]

VMware was acquired by Broadcom, and vmware e-mail addresses will
be invalid in the future.

Change e-mail to broadcom.com for those still in the company and
remove the other entries.

Signed-off-by: Jochen Behrens <jochen.behrens at broadcom.com>
---
 .mailmap | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/.mailmap b/.mailmap
index 3843868716..51f04b11b6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -173,7 +173,7 @@ Ben Walker <benjamin.walker at intel.com>
 Bernard Iremonger <bernard.iremonger at intel.com>
 Bert van Leeuwen <bert.vanleeuwen at netronome.com>
 Bhagyada Modali <bhagyada.modali at amd.com>
-Bharat Mota <bmota at vmware.com>
+Bharat Mota <bharat.mota at broadcom.com>
 Bhuvan Mital <bhuvan.mital at amd.com>
 Bill Hong <bhong at brocade.com>
 Billy McFall <bmcfall at redhat.com>
@@ -184,7 +184,7 @@ Bin Zheng <zhengbin.89740 at bytedance.com>
 Björn Töpel <bjorn.topel at intel.com>
 Bo Chen <box.c.chen at intel.com>
 Boleslav Stankevich <boleslav.stankevich at oktetlabs.ru>
-Boon Ang <bang at vmware.com>
+Boon Ang <boon.ang at broadcom.com>
 Boris Ouretskey <borisusun at gmail.com>
 Boris Pismenny <borisp at mellanox.com>
 Brad Larson <bradley.larson at amd.com>
@@ -230,7 +230,6 @@ Chengwen Feng <fengchengwen at huawei.com>
 Chenmin Sun <chenmin.sun at intel.com>
 Chenxu Di <chenxux.di at intel.com>
 Chenyu Huang <chenyux.huang at intel.com>
-Cheryl Houser <chouser at vmware.com>
 Chinh T Cao <chinh.t.cao at intel.com>
 Chintu Hetam <rometoroam at gmail.com>
 Choonho Son <choonho.son at gmail.com>
@@ -273,7 +272,6 @@ Damodharam Ammepalli <damodharam.ammepalli at broadcom.com>
 Dan Aloni <dan at kernelim.com>
 Dana Vardi <danat at marvell.com>
 Dan Gora <dg at adax.com>
-Daniele Di Proietto <ddiproietto at vmware.com>
 Daniel Kaminsky <daniel.kaminsky at infinitelocality.com>
 Daniel Kan <dan at nyansa.com>
 Daniel Martin Buckley <daniel.m.buckley at intel.com>
@@ -331,7 +329,6 @@ Dex Chen <dex.chen at ruckuswireless.com>
 Dexia Li <dexia.li at jaguarmicro.com>
 Dexuan Cui <decui at microsoft.com>
 Dharmik Thakkar <dharmikjayesh.thakkar at arm.com> <dharmik.thakkar at arm.com>
-Dheemanth Mallikarjun <dheemanthm at vmware.com>
 Diana Wang <na.wang at corigine.com>
 Didier Pallard <didier.pallard at 6wind.com>
 Dilshod Urazov <dilshod.urazov at oktetlabs.ru>
@@ -364,7 +361,6 @@ Duncan Bellamy <dunk at denkimushi.com>
 Dustin Lundquist <dustin at null-ptr.net>
 Dzmitry Sautsa <dzmitryx.sautsa at intel.com>
 Ed Czeck <ed.czeck at atomicrules.com>
-Eduard Serra <eserra at vmware.com>
 Edward Makarov <makarov at kraftway.ru>
 Edwin Brossette <edwin.brossette at 6wind.com>
 Eelco Chaudron <echaudro at redhat.com>
@@ -469,7 +465,7 @@ Guduri Prathyusha <gprathyusha at caviumnetworks.com>
 Guido Barzini <gbarzini at solarflare.com>
 Guillaume Gaudonville <guillaume.gaudonville at 6wind.com>
 Guinan Sun <guinanx.sun at intel.com>
-Guolin Yang <gyang at vmware.com>
+Guolin Yang <guolin.yang at broadcom.com>
 Guo Xin <gxin at ezchip.com>
 Guoyang Zhou <zhouguoyang at huawei.com>
 Guruprasad Rao <guruprasadx.rao at intel.com>
@@ -644,7 +640,6 @@ Jiawei Wang <jiaweiw at nvidia.com> <jiaweiw at mellanox.com>
 Jiawei Zhu <zhujiawei12 at huawei.com>
 Jiawen Wu <jiawenwu at trustnetic.com>
 Jiayu Hu <hujiayu.hu at foxmail.com> <jiayu.hu at intel.com>
-Jia Yu <jyu at vmware.com>
 Jie Hai <haijie1 at huawei.com>
 Jie Liu <jie2.liu at hxt-semitech.com>
 Jie Pan <panjie5 at jd.com>
@@ -659,13 +654,13 @@ Jing Chen <jing.d.chen at intel.com>
 Jingguo Fu <jingguox.fu at intel.com>
 Jingjing Wu <jingjing.wu at intel.com>
 Jingzhao Ni <jingzhao.ni at arm.com>
-Jin Heo <heoj at vmware.com>
+Jin Heo <jin.heo at broadcom.com>
 Jin Ling <jin.ling at intel.com>
 Jin Liu <jin.liu at corigine.com>
 Jin Yu <jin.yu at intel.com>
 Jiri Slaby <jslaby at suse.cz>
 Job Abraham <job.abraham at intel.com>
-Jochen Behrens <jbehrens at vmware.com>
+Jochen Behrens <jochen.behrens at broadcom.com>
 Joey Xing <joey.xing at jaguarmicro.com>
 Johan Faltstrom <johan.faltstrom at netinsight.net>
 Johan Källström <johan.kallstrom at ericsson.com>
@@ -775,7 +770,7 @@ Krzysztof Witek <krzysztof.witek at 6wind.com>
 Kuan Xu <kuanx.xu at intel.com>
 Kuba Kozak <kubax.kozak at intel.com>
 Kumar Amber <kumar.amber at intel.com>
-Kumara Parameshwaran <kumaraparamesh92 at gmail.com> <kparameshwar at vmware.com>
+Kumara Parameshwaran <kumaraparamesh92 at gmail.com>
 Kumar Sanghvi <kumaras at chelsio.com>
 Kyle Larose <klarose at sandvine.com>
 Lance Richardson <lance.richardson at broadcom.com>
@@ -826,7 +821,6 @@ Long Li <longli at microsoft.com>
 Long Wu <long.wu at corigine.com>
 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 Vizzarro <luca.vizzarro at arm.com>
@@ -1075,7 +1069,7 @@ 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 <pagupta at vmware.com> <pagupta at redhat.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>
@@ -1228,9 +1222,8 @@ Roman Kapl <rka at sysgo.com>
 Roman Korynkevych <romanx.korynkevych at intel.com>
 Roman Storozhenko <roman.storozhenko at intel.com>
 Roman Zhukov <roman.zhukov at arknetworks.am> <roman.zhukov at oktetlabs.ru>
-Ronak Doshi <doshir at vmware.com>
+Ronak Doshi <ronak.doshi at broadcom.com>
 Ron Beider <rbeider at amazon.com>
-Ronghua Zhang <rzhang at vmware.com>
 RongQiang Xie <xie.rongqiang at zte.com.cn>
 RongQing Li <lirongqing at baidu.com>
 Rongwei Liu <rongweil at nvidia.com>
@@ -1322,9 +1315,7 @@ Shiweixian <shiweixian at huawei.com>
 Shiyang He <shiyangx.he at intel.com>
 Shlomi Gridish <sgridish at marvell.com>
 Shougang Wang <shougangx.wang at intel.com>
-Shraddha Joshi <jshraddha at vmware.com>
 Shreyansh Jain <shreyansh.jain at nxp.com>
-Shrikrishna Khare <skhare at vmware.com>
 Shuai Zhu <shuaix.zhu at intel.com>
 Shuanglin Wang <shuanglin.wang at broadcom.com>
 Shuki Katzenelson <shuki at lightbitslabs.com>
@@ -1651,7 +1642,7 @@ Yongji Xie <xieyongji at baidu.com>
 Yong Liu <yong.liu at intel.com>
 Yongping Zhang <yongping.zhang at broadcom.com>
 Yongseok Koh <yskoh at mellanox.com>
-Yong Wang <wang.yong19 at zte.com.cn> <yongwang at vmware.com>
+Yong Wang <wang.yong19 at zte.com.cn>
 Yongxin Liu <yongxin.liu at windriver.com>
 Yong Xu <yong.xu at corigine.com>
 Yoni Gilad <yonig at radcom.com>
-- 
2.34.1


-- 
This electronic communication and the information and any files transmitted 
with it, or attached to it, are confidential and are intended solely for 
the use of the individual or entity to whom it is addressed and may contain 
information that is confidential, legally privileged, protected by privacy 
laws, or otherwise restricted from disclosure to anyone else. If you are 
not the intended recipient or the person responsible for delivering the 
e-mail to the intended recipient, you are hereby notified that any use, 
copying, distributing, dissemination, forwarding, printing, or copying of 
this e-mail is strictly prohibited. If you received this e-mail in error, 
please return the e-mail to the sender, delete it from your computer, and 
destroy any printed copy of it.