[PATCH v2 1/2] MAINTAINERS: update Cavium ThunderX drivers

[Robert Richter]

From: Jan Glauber <jglauber@xxxxxxxxxxx>

Remove my maintainer entries for ThunderX drivers as I'm moving on
and won't have access to ThunderX hardware anymore and add Robert.
Also remove the obsolete addresses of David Daney and Steven Hill.

Add an entry to .mailmap for my various email addresses.

Cc: Ganapatrao Prabhakerrao Kulkarni <gkulkarni@xxxxxxxxxxx>
Cc: soc@xxxxxxxxxx
Signed-off-by: Jan Glauber <jglauber@xxxxxxxxxxx>
Signed-off-by: Robert Richter <rrichter@xxxxxxxxxxx>
---
 .mailmap    |  3 +++
 MAINTAINERS | 17 ++++++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.mailmap b/.mailmap
index fd6219293057..f5a8246e36d6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -104,6 +104,9 @@ James E Wilson <wilson@xxxxxxxxxxxx>
 James Hogan <jhogan@xxxxxxxxxx> <james.hogan@xxxxxxxxxx>
 James Hogan <jhogan@xxxxxxxxxx> <james@xxxxxxxxxxxxx>
 James Ketrenos <jketreno@io.(none)>
+Jan Glauber <jan.glauber@xxxxxxxxx> <jang@xxxxxxxxxx>
+Jan Glauber <jan.glauber@xxxxxxxxx> <jang@xxxxxxxxxxxxxxxxxx>
+Jan Glauber <jan.glauber@xxxxxxxxx> <jglauber@xxxxxxxxxx>
 Jason Gunthorpe <jgg@xxxxxxxx> <jgg@xxxxxxxxxxxx>
 Jason Gunthorpe <jgg@xxxxxxxx> <jgunthorpe@xxxxxxxxxxxxxxxxxxxx>
 Javi Merino <javi.merino@xxxxxxxxxx> <javi.merino@xxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index eb19fad370d7..2bef41729946 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3705,8 +3705,7 @@ S:	Maintained
 F:	drivers/net/wireless/ath/carl9170/
 
 CAVIUM I2C DRIVER
-M:	Jan Glauber <jglauber@xxxxxxxxxx>
-M:	David Daney <david.daney@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 W:	http://www.cavium.com
 S:	Supported
 F:	drivers/i2c/busses/i2c-octeon*
@@ -3722,9 +3721,7 @@ S:	Supported
 F:	drivers/net/ethernet/cavium/liquidio/
 
 CAVIUM MMC DRIVER
-M:	Jan Glauber <jglauber@xxxxxxxxxx>
-M:	David Daney <david.daney@xxxxxxxxxx>
-M:	Steven J. Hill <Steven.Hill@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 W:	http://www.cavium.com
 S:	Supported
 F:	drivers/mmc/host/cavium*
@@ -5834,15 +5831,14 @@ F:	drivers/edac/highbank*
 
 EDAC-CAVIUM OCTEON
 M:	Ralf Baechle <ralf@xxxxxxxxxxxxxx>
-M:	David Daney <david.daney@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 L:	linux-edac@xxxxxxxxxxxxxxx
 L:	linux-mips@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/edac/octeon_edac*
 
 EDAC-CAVIUM THUNDERX
-M:	David Daney <david.daney@xxxxxxxxxx>
-M:	Jan Glauber <jglauber@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 L:	linux-edac@xxxxxxxxxxxxxxx
 S:	Supported
 F:	drivers/edac/thunderx_edac*
@@ -12629,7 +12625,7 @@ F:	Documentation/devicetree/bindings/pci/axis,artpec*
 F:	drivers/pci/controller/dwc/*artpec*
 
 PCIE DRIVER FOR CAVIUM THUNDERX
-M:	David Daney <david.daney@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 L:	linux-pci@xxxxxxxxxxxxxxx
 L:	linux-arm-kernel@xxxxxxxxxxxxxxxxxxx (moderated for non-subscribers)
 S:	Supported
@@ -16137,7 +16133,7 @@ S:	Maintained
 F:	drivers/net/thunderbolt.c
 
 THUNDERX GPIO DRIVER
-M:	David Daney <david.daney@xxxxxxxxxx>
+M:	Robert Richter <rrichter@xxxxxxxxxxx>
 S:	Maintained
 F:	drivers/gpio/gpio-thunderx.c
 
@@ -17916,7 +17912,6 @@ F:	drivers/char/xillybus/
 
 XLP9XX I2C DRIVER
 M:	George Cherian <george.cherian@xxxxxxxxxx>
-M:	Jan Glauber <jglauber@xxxxxxxxxx>
 L:	linux-i2c@xxxxxxxxxxxxxxx
 W:	http://www.cavium.com
 S:	Supported
-- 
2.20.1