MAINTAINERS: change vmware.com addresses to broadcom.com

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.

Link: https://lkml.kernel.org/r/[email protected]
Signed-off-by: Alexey Makhalov <[email protected]>
Acked-by: Florian Fainelli <[email protected]>
Acked-by: Ajay Kaher <[email protected]>
Acked-by: Ronak Doshi <[email protected]>
Acked-by: Nick Shi <[email protected]>
Acked-by: Bryan Tan <[email protected]>
Acked-by: Vishnu Dasa <[email protected]>
Acked-by: Vishal Bhakta <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>

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 <[email protected]>
 Adam Radford <[email protected]>
 Adriana Reus <[email protected]> <[email protected]>
 Adrian Bunk <[email protected]>
+Ajay Kaher <[email protected]> <[email protected]>
 Akhil P Oommen <[email protected]> <[email protected]>
 Alan Cox <[email protected]>
 Alan Cox <[email protected]>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
 Alexei Starovoitov <[email protected]> <[email protected]>
 Alexei Starovoitov <[email protected]> <[email protected]>
 Alexei Starovoitov <[email protected]> <[email protected]>
+Alexey Makhalov <[email protected]> <[email protected]>
 Alex Hung <[email protected]> <[email protected]>
 Alex Shi <[email protected]> <[email protected]>
 Alex Shi <[email protected]> <[email protected]>
@@ -110,6 +112,7 @@ Brendan Higgins <[email protected]> <[email protected]>
 Brian Avery <[email protected]>
 Brian King <[email protected]>
 Brian Silverman <[email protected]> <[email protected]>
+Bryan Tan <[email protected]> <[email protected]>
 Cai Huoqing <[email protected]> <[email protected]>
 Can Guo <[email protected]> <[email protected]>
 Carl Huang <[email protected]> <[email protected]>
@@ -529,6 +532,7 @@ Rocky Liao <[email protected]> <[email protected]>
 Roman Gushchin <[email protected]> <[email protected]>
 Roman Gushchin <[email protected]> <[email protected]>
 Roman Gushchin <[email protected]> <[email protected]>
+Ronak Doshi <[email protected]> <[email protected]>
 Muchun Song <[email protected]> <[email protected]>
 Muchun Song <[email protected]> <[email protected]>
 Ross Zwisler <[email protected]> <[email protected]>
@@ -651,6 +655,7 @@ Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
+Vishnu Dasa <[email protected]> <[email protected]>
 Vivek Aknurwar <[email protected]> <[email protected]>
 Vivien Didelot <[email protected]> <[email protected]>
 Vlad Dogaru <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 7c121493f43d..bd9fbb315e69 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -16731,9 +16731,9 @@ F:	include/uapi/linux/ppdev.h
 
 PARAVIRT_OPS INTERFACE
 M:	Juergen Gross <[email protected]>
-R:	Ajay Kaher <[email protected]>
-R:	Alexey Makhalov <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+R:	Ajay Kaher <[email protected]>
+R:	Alexey Makhalov <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
@@ -23652,9 +23652,9 @@ S:	Supported
 F:	drivers/misc/vmw_balloon.c
 
 VMWARE HYPERVISOR INTERFACE
-M:	Ajay Kaher <[email protected]>
-M:	Alexey Makhalov <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Ajay Kaher <[email protected]>
+M:	Alexey Makhalov <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
@@ -23663,34 +23663,34 @@ F:	arch/x86/include/asm/vmware.h
 F:	arch/x86/kernel/cpu/vmware.c
 
 VMWARE PVRDMA DRIVER
-M:	Bryan Tan <[email protected]>
-M:	Vishnu Dasa <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Bryan Tan <[email protected]>
+M:	Vishnu Dasa <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/infiniband/hw/vmw_pvrdma/
 
 VMWARE PVSCSI DRIVER
-M:	Vishal Bhakta <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Vishal Bhakta <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/scsi/vmw_pvscsi.c
 F:	drivers/scsi/vmw_pvscsi.h
 
 VMWARE VIRTUAL PTP CLOCK DRIVER
-M:	Jeff Sipek <[email protected]>
-R:	Ajay Kaher <[email protected]>
-R:	Alexey Makhalov <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Nick Shi <[email protected]>
+R:	Ajay Kaher <[email protected]>
+R:	Alexey Makhalov <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/ptp/ptp_vmw.c
 
 VMWARE VMCI DRIVER
-M:	Bryan Tan <[email protected]>
-M:	Vishnu Dasa <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Bryan Tan <[email protected]>
+M:	Vishnu Dasa <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/misc/vmw_vmci/
@@ -23705,16 +23705,16 @@ F:	drivers/input/mouse/vmmouse.c
 F:	drivers/input/mouse/vmmouse.h
 
 VMWARE VMXNET3 ETHERNET DRIVER
-M:	Ronak Doshi <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Ronak Doshi <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/vmxnet3/
 
 VMWARE VSOCK VMCI TRANSPORT DRIVER
-M:	Bryan Tan <[email protected]>
-M:	Vishnu Dasa <[email protected]>
-R:	VMware PV-Drivers Reviewers <[email protected]>
+M:	Bryan Tan <[email protected]>
+M:	Vishnu Dasa <[email protected]>
+R:	Broadcom internal kernel review list <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	net/vmw_vsock/vmci_transport*