[PATCH] MAINTAINERS: change vmware.com addresses to broadcom.com

[Alexey Makhalov]

Update all remaining vmware.com email addresses to actual broadcom.com.

Add corresponding .mailmap entries for maintainers who contributed in the
past as the vmware.com address will start bouncing soon.

Maintainership update. Jeff Sipek has left VMware, Nick Shi will be
maintaining VMware PTP.

Signed-off-by: Alexey Makhalov <alexey.makhalov@xxxxxxxxxxxx>
Acked-by: Florian Fainelli <florian.fainelli@xxxxxxxxxxxx>
Acked-by: Ajay Kaher <ajay.kaher@xxxxxxxxxxxx>
Acked-by: Ronak Doshi <ronak.doshi@xxxxxxxxxxxx>
Acked-by: Nick Shi <nick.shi@xxxxxxxxxxxx>
Acked-by: Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx>
Acked-by: Vishnu Dasa <vishnu.dasa@xxxxxxxxxxxx>
Acked-by: Vishal Bhakta <vishal.bhakta@xxxxxxxxxxxx>
Cc: Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
---
 .mailmap    |  5 +++++
 MAINTAINERS | 46 +++++++++++++++++++++++-----------------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/.mailmap b/.mailmap
index 59c9a841bf71..8284692f9610 100644
--- a/.mailmap
+++ b/.mailmap
@@ -20,6 +20,7 @@ Adam Oldham <oldhamca@xxxxxxxxx>
 Adam Radford <aradford@xxxxxxxxx>
 Adriana Reus <adi.reus@xxxxxxxxx> <adriana.reus@xxxxxxxxx>
 Adrian Bunk <bunk@xxxxxxxxx>
+Ajay Kaher <ajay.kaher@xxxxxxxxxxxx> <akaher@xxxxxxxxxx>
 Akhil P Oommen <quic_akhilpo@xxxxxxxxxxx> <akhilpo@xxxxxxxxxxxxxx>
 Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
 Alan Cox <root@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <quic_ailizaro@xxxxxxxxxxx> <ailizaro@xxxxxxxxxxxxxx>
 Alexei Starovoitov <ast@xxxxxxxxxx> <alexei.starovoitov@xxxxxxxxx>
 Alexei Starovoitov <ast@xxxxxxxxxx> <ast@xxxxxx>
 Alexei Starovoitov <ast@xxxxxxxxxx> <ast@xxxxxxxxxxxx>
+Alexey Makhalov <alexey.amakhalov@xxxxxxxxxxxx> <amakhalov@xxxxxxxxxx>
 Alex Hung <alexhung@xxxxxxxxx> <alex.hung@xxxxxxxxxxxxx>
 Alex Shi <alexs@xxxxxxxxxx> <alex.shi@xxxxxxxxx>
 Alex Shi <alexs@xxxxxxxxxx> <alex.shi@xxxxxxxxxx>
@@ -110,6 +112,7 @@ Brendan Higgins <brendan.higgins@xxxxxxxxx> <brendanhiggins@xxxxxxxxxx>
 Brian Avery <b.avery@xxxxxx>
 Brian King <brking@xxxxxxxxxx>
 Brian Silverman <bsilver16384@xxxxxxxxx> <brian.silverman@xxxxxxxxxxxxxxxxx>
+Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx> <bryantan@xxxxxxxxxx>
 Cai Huoqing <cai.huoqing@xxxxxxxxx> <caihuoqing@xxxxxxxxx>
 Can Guo <quic_cang@xxxxxxxxxxx> <cang@xxxxxxxxxxxxxx>
 Carl Huang <quic_cjhuang@xxxxxxxxxxx> <cjhuang@xxxxxxxxxxxxxx>
@@ -529,6 +532,7 @@ Rocky Liao <quic_rjliao@xxxxxxxxxxx> <rjliao@xxxxxxxxxxxxxx>
 Roman Gushchin <roman.gushchin@xxxxxxxxx> <guro@xxxxxx>
 Roman Gushchin <roman.gushchin@xxxxxxxxx> <guroan@xxxxxxxxx>
 Roman Gushchin <roman.gushchin@xxxxxxxxx> <klamm@xxxxxxxxxxxxxx>
+Ronak Doshi <ronak.doshi@xxxxxxxxxxxx> <doshir@xxxxxxxxxx>
 Muchun Song <muchun.song@xxxxxxxxx> <songmuchun@xxxxxxxxxxxxx>
 Muchun Song <muchun.song@xxxxxxxxx> <smuchun@xxxxxxxxx>
 Ross Zwisler <zwisler@xxxxxxxxxx> <ross.zwisler@xxxxxxxxxxxxxxx>
@@ -651,6 +655,7 @@ Viresh Kumar <vireshk@xxxxxxxxxx> <viresh.kumar@xxxxxx>
 Viresh Kumar <vireshk@xxxxxxxxxx> <viresh.linux@xxxxxxxxx>
 Viresh Kumar <viresh.kumar@xxxxxxxxxx> <viresh.kumar@xxxxxxxxxx>
 Viresh Kumar <viresh.kumar@xxxxxxxxxx> <viresh.kumar@xxxxxxxxxx>
+Vishnu Dasa <vishnu.dasa@xxxxxxxxxxxx> <vdasa@xxxxxxxxxx>
 Vivek Aknurwar <quic_viveka@xxxxxxxxxxx> <viveka@xxxxxxxxxxxxxx>
 Vivien Didelot <vivien.didelot@xxxxxxxxx> <vivien.didelot@xxxxxxxxxxxxxxxxxxxx>
 Vlad Dogaru <ddvlad@xxxxxxxxx> <vlad.dogaru@xxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index ae447c08a11d..2658c4cc22b8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16731,9 +16731,9 @@ F:	include/uapi/linux/ppdev.h
 
 PARAVIRT_OPS INTERFACE
 M:	Juergen Gross <jgross@xxxxxxxx>
-R:	Ajay Kaher <akaher@xxxxxxxxxx>
-R:	Alexey Makhalov <amakhalov@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+R:	Ajay Kaher <ajay.kaher@xxxxxxxxxxxx>
+R:	Alexey Makhalov <alexey.amakhalov@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	virtualization@xxxxxxxxxxxxxxx
 L:	x86@xxxxxxxxxx
 S:	Supported
@@ -23666,9 +23666,9 @@ S:	Supported
 F:	drivers/misc/vmw_balloon.c
 
 VMWARE HYPERVISOR INTERFACE
-M:	Ajay Kaher <akaher@xxxxxxxxxx>
-M:	Alexey Makhalov <amakhalov@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Ajay Kaher <ajay.kaher@xxxxxxxxxxxx>
+M:	Alexey Makhalov <alexey.amakhalov@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	virtualization@xxxxxxxxxxxxxxx
 L:	x86@xxxxxxxxxx
 S:	Supported
@@ -23677,34 +23677,34 @@ F:	arch/x86/include/asm/vmware.h
 F:	arch/x86/kernel/cpu/vmware.c
 
 VMWARE PVRDMA DRIVER
-M:	Bryan Tan <bryantan@xxxxxxxxxx>
-M:	Vishnu Dasa <vdasa@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx>
+M:	Vishnu Dasa <vishnu.dasa@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	linux-rdma@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/infiniband/hw/vmw_pvrdma/
 
 VMWARE PVSCSI DRIVER
-M:	Vishal Bhakta <vbhakta@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Vishal Bhakta <vishal.bhakta@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	linux-scsi@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/scsi/vmw_pvscsi.c
 F:	drivers/scsi/vmw_pvscsi.h
 
 VMWARE VIRTUAL PTP CLOCK DRIVER
-M:	Jeff Sipek <jsipek@xxxxxxxxxx>
-R:	Ajay Kaher <akaher@xxxxxxxxxx>
-R:	Alexey Makhalov <amakhalov@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Nick Shi <nick.shi@xxxxxxxxxxxx>
+R:	Ajay Kaher <ajay.kaher@xxxxxxxxxxxx>
+R:	Alexey Makhalov <alexey.amakhalov@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	netdev@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/ptp/ptp_vmw.c
 
 VMWARE VMCI DRIVER
-M:	Bryan Tan <bryantan@xxxxxxxxxx>
-M:	Vishnu Dasa <vdasa@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx>
+M:	Vishnu Dasa <vishnu.dasa@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/misc/vmw_vmci/
@@ -23719,16 +23719,16 @@ F:	drivers/input/mouse/vmmouse.c
 F:	drivers/input/mouse/vmmouse.h
 
 VMWARE VMXNET3 ETHERNET DRIVER
-M:	Ronak Doshi <doshir@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Ronak Doshi <ronak.doshi@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	netdev@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/net/vmxnet3/
 
 VMWARE VSOCK VMCI TRANSPORT DRIVER
-M:	Bryan Tan <bryantan@xxxxxxxxxx>
-M:	Vishnu Dasa <vdasa@xxxxxxxxxx>
-R:	VMware PV-Drivers Reviewers <pv-drivers@xxxxxxxxxx>
+M:	Bryan Tan <bryan-bt.tan@xxxxxxxxxxxx>
+M:	Vishnu Dasa <vishnu.dasa@xxxxxxxxxxxx>
+R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@xxxxxxxxxxxx>
 L:	linux-kernel@xxxxxxxxxxxxxxx
 S:	Supported
 F:	net/vmw_vsock/vmci_transport*
-- 
2.39.0