MAINTAINERS: .mailmap: Update Sumit Garg's email address

Update Sumit Garg's email address to @kernel.org.

Signed-off-by: Sumit Garg <sumit.garg@linaro.org>

diff --git a/.mailmap b/.mailmap
index b2c98757a71c928e85565e4966e2e8573c5f8fe5..ff85151702f8081f40ffff95e929fe7025bbe181 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -124,6 +124,7 @@ Srinivas Neeli <srinivas.neeli@amd.com> <srinivas.neeli@xilinx.com>
 Stefan Roese <sr@denx.de> <stroese>
 Stefano Babic <sbabic@denx.de>
 Stefano Stabellini <stefano.stabellini@amd.com> <stefano.stabellini@xilinx.com>
+Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
 Tom Rini <trini@konsulko.com> <trini@ti.com>
 Tomas Thoresen <tomas.thoresen@amd.com> <tomast@xilinx.com>
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 4e90a888b94c463c5cfb9bd1e1f350728ffac443..0315c606744cb4acf80e18f61bcac13decfc8b63 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -639,7 +639,7 @@ F:  include/env/adi/
 ARM SNAPDRAGON
 M:     Caleb Connolly <caleb.connolly@linaro.org>
 M:     Neil Armstrong <neil.armstrong@linaro.org>
-R:     Sumit Garg <sumit.garg@linaro.org>
+R:     Sumit Garg <sumit.garg@kernel.org>
 L:     u-boot-qcom@groups.io
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-snapdragon.git
@@ -1043,9 +1043,10 @@ F:       common/cyclic.c
 F:     include/cyclic.h
 
 DEVICETREE REBASING SUBTREE
-M:     Sumit Garg <sumit.garg@linaro.org>
+M:     Sumit Garg <sumit.garg@kernel.org>
 S:     Maintained
 F:     dts/upstream/
+N:     OF_UPSTREAM
 
 DFU
 M:     Lukasz Majewski <lukma@denx.de>
@@ -1451,7 +1452,7 @@ S:        Maintained
 F:     tools/patman/
 
 PCIe DWC IMX
-M:     Sumit Garg <sumit.garg@linaro.org>
+M:     Sumit Garg <sumit.garg@kernel.org>
 S:     Maintained
 F:     drivers/pci/pcie_dw_imx.c
 F:     drivers/phy/phy-imx8m-pcie.c