MAINTAINERS: update Cavium ThunderX drivers

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.

Link: https://lore.kernel.org/r/20191119190436.17875-2-rrichter@marvell.com
Cc: Ganapatrao Prabhakerrao Kulkarni <gkulkarni@marvell.com>
Cc: soc@kernel.org
Signed-off-by: Jan Glauber <jglauber@marvell.com>
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/.mailmap b/.mailmap
index e4c8f09..745b6ec 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -104,6 +104,9 @@ James E Wilson <wilson@specifix.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Ketrenos <jketreno@io.(none)>
+Jan Glauber <jan.glauber@gmail.com> <jang@de.ibm.com>
+Jan Glauber <jan.glauber@gmail.com> <jang@linux.vnet.ibm.com>
+Jan Glauber <jan.glauber@gmail.com> <jglauber@cavium.com>
 Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
 Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 4bd6380..6cfe901 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3704,8 +3704,7 @@ S:        Maintained
 F:     drivers/net/wireless/ath/carl9170/
 
 CAVIUM I2C DRIVER
-M:     Jan Glauber <jglauber@cavium.com>
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 W:     http://www.cavium.com
 S:     Supported
 F:     drivers/i2c/busses/i2c-octeon*
@@ -3721,9 +3720,7 @@ S:        Supported
 F:     drivers/net/ethernet/cavium/liquidio/
 
 CAVIUM MMC DRIVER
-M:     Jan Glauber <jglauber@cavium.com>
-M:     David Daney <david.daney@cavium.com>
-M:     Steven J. Hill <Steven.Hill@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 W:     http://www.cavium.com
 S:     Supported
 F:     drivers/mmc/host/cavium*
@@ -5833,15 +5830,14 @@ F:      drivers/edac/highbank*
 
 EDAC-CAVIUM OCTEON
 M:     Ralf Baechle <ralf@linux-mips.org>
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-edac@vger.kernel.org
 L:     linux-mips@vger.kernel.org
 S:     Supported
 F:     drivers/edac/octeon_edac*
 
 EDAC-CAVIUM THUNDERX
-M:     David Daney <david.daney@cavium.com>
-M:     Jan Glauber <jglauber@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-edac@vger.kernel.org
 S:     Supported
 F:     drivers/edac/thunderx_edac*
@@ -12622,7 +12618,7 @@ F:      Documentation/devicetree/bindings/pci/axis,artpec*
 F:     drivers/pci/controller/dwc/*artpec*
 
 PCIE DRIVER FOR CAVIUM THUNDERX
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
@@ -16130,7 +16126,7 @@ S:      Maintained
 F:     drivers/net/thunderbolt.c
 
 THUNDERX GPIO DRIVER
-M:     David Daney <david.daney@cavium.com>
+M:     Robert Richter <rrichter@marvell.com>
 S:     Maintained
 F:     drivers/gpio/gpio-thunderx.c
 
@@ -17903,7 +17899,6 @@ F:      drivers/char/xillybus/
 
 XLP9XX I2C DRIVER
 M:     George Cherian <george.cherian@cavium.com>
-M:     Jan Glauber <jglauber@cavium.com>
 L:     linux-i2c@vger.kernel.org
 W:     http://www.cavium.com
 S:     Supported