MAINTAINERS: Update Manivannan Sadhasivam email address

My Linaro email is going to bounce soon, so switch to the kernel.org alias
and add relevant .mailmap entry.

[bhelgaas: squash https://patch.msgid.link/20250604120833.32791-3-manivannan.sadhasivam@linaro.org]
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://patch.msgid.link/20250604120833.32791-2-manivannan.sadhasivam@linaro.org

diff --git a/.mailmap b/.mailmap
index 5224f3cc2d34b98b1d443d56658e5c9d7286cd5a..d6ea8d58694a4462c5b5bb4fb11f9144b48d224c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -453,6 +453,7 @@ Maheshwar Ajja <quic_majja@quicinc.com> <majja@codeaurora.org>
 Malathi Gottam <quic_mgottam@quicinc.com> <mgottam@codeaurora.org>
 Manikanta Pubbisetty <quic_mpubbise@quicinc.com> <mpubbise@codeaurora.org>
 Manivannan Sadhasivam <mani@kernel.org> <manivannanece23@gmail.com>
+Manivannan Sadhasivam <mani@kernel.org> <manivannan.sadhasivam@linaro.org>
 Manoj Basapathi <quic_manojbm@quicinc.com> <manojbm@codeaurora.org>
 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index d5d1a4aea0e8410e72fe17854b844d9078aafe38..f1a0769ed8ee30a877a778dd5b4c7d0689796b6f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2102,7 +2102,7 @@ F:        arch/arm/plat-*/
 
 ARM/ACTIONS SEMI ARCHITECTURE
 M:     Andreas Färber <afaerber@suse.de>
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-actions@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -2354,7 +2354,7 @@ F:        arch/arm/boot/dts/intel/axm/
 F:     arch/arm/mach-axxia/
 
 ARM/BITMAIN ARCHITECTURE
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     Documentation/devicetree/bindings/arm/bitmain.yaml
@@ -3021,7 +3021,7 @@ F:        include/linux/soc/qcom/
 F:     include/soc/qcom/
 
 ARM/RDA MICRO ARCHITECTURE
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-unisoc@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -3718,7 +3718,7 @@ F:        Documentation/admin-guide/aoe/
 F:     drivers/block/aoe/
 
 ATC260X PMIC MFD DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 M:     Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
 L:     linux-actions@lists.infradead.org
 S:     Maintained
@@ -6721,7 +6721,7 @@ S:        Orphan
 F:     drivers/mtd/nand/raw/denali*
 
 DESIGNWARE EDMA CORE IP DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     dmaengine@vger.kernel.org
 S:     Maintained
 F:     drivers/dma/dw-edma/
@@ -8536,7 +8536,7 @@ S:        Maintained
 F:     drivers/edac/pnd2_edac.[ch]
 
 EDAC-QCOM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
 L:     linux-edac@vger.kernel.org
 S:     Maintained
@@ -14664,7 +14664,7 @@ F:      drivers/hid/hid-mcp2221.c
 
 MCP251XFD SPI-CAN NETWORK DRIVER
 M:     Marc Kleine-Budde <mkl@pengutronix.de>
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 R:     Thomas Kopp <thomas.kopp@microchip.com>
 L:     linux-can@vger.kernel.org
 S:     Maintained
@@ -15644,7 +15644,7 @@ F:      arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 F:     arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
 
 MHI BUS
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     mhi@lists.linux.dev
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -18545,7 +18545,7 @@ F:      drivers/pci/controller/dwc/pci-exynos.c
 
 PCI DRIVER FOR SYNOPSYS DESIGNWARE
 M:     Jingoo Han <jingoohan1@gmail.com>
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-pci@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/pci/snps,dw-pcie-ep.yaml
@@ -18580,7 +18580,7 @@ F:      Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml
 F:     drivers/pci/controller/pcie-xilinx-cpm.c
 
 PCI ENDPOINT SUBSYSTEM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 M:     Krzysztof Wilczyński <kwilczynski@kernel.org>
 R:     Kishon Vijay Abraham I <kishon@kernel.org>
 L:     linux-pci@vger.kernel.org
@@ -18633,7 +18633,7 @@ F:      drivers/pci/controller/pci-xgene-msi.c
 PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS
 M:     Lorenzo Pieralisi <lpieralisi@kernel.org>
 M:     Krzysztof Wilczyński <kwilczynski@kernel.org>
-R:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 R:     Rob Herring <robh@kernel.org>
 L:     linux-pci@vger.kernel.org
 S:     Supported
@@ -18779,7 +18779,7 @@ F:      Documentation/devicetree/bindings/pci/microchip*
 F:     drivers/pci/controller/plda/*microchip*
 
 PCIE DRIVER FOR QUALCOMM MSM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -18815,7 +18815,7 @@ F:      Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml
 F:     drivers/pci/controller/plda/pcie-starfive.c
 
 PCIE ENDPOINT DRIVER FOR QUALCOMM
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -19933,7 +19933,7 @@ F:      drivers/iommu/arm/arm-smmu/arm-smmu-qcom*
 F:     drivers/iommu/msm_iommu*
 
 QUALCOMM IPC ROUTER (QRTR) DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     include/trace/events/qrtr.h
@@ -19941,7 +19941,7 @@ F:      include/uapi/linux/qrtr.h
 F:     net/qrtr/
 
 QUALCOMM IPCC MAILBOX DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml
@@ -19975,7 +19975,7 @@ F:      Documentation/devicetree/bindings/media/qcom,*-iris.yaml
 F:     drivers/media/platform/qcom/iris/
 
 QUALCOMM NAND CONTROLLER DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-mtd@lists.infradead.org
 L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
@@ -22510,7 +22510,7 @@ F:      Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml
 F:     drivers/media/i2c/imx283.c
 
 SONY IMX290 SENSOR DRIVER
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media.git
@@ -22519,7 +22519,7 @@ F:      drivers/media/i2c/imx290.c
 
 SONY IMX296 SENSOR DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media.git
@@ -24815,7 +24815,7 @@ S:      Maintained
 F:     drivers/ufs/host/ufs-mediatek*
 
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS
-M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+M:     Manivannan Sadhasivam <mani@kernel.org>
 L:     linux-arm-msm@vger.kernel.org
 L:     linux-scsi@vger.kernel.org
 S:     Maintained