MAINTAINERS: Update Jonathan Cameron's email address

Update my email address for CXL, FWCTL and Cache subsystems to use my
kernel.org account. Also update .mailmap.

Separate patches will replace maintainers for HiSilicon specific hardware.

Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://patch.msgid.link/20260415124357.12539-1-Jonathan.Cameron@huawei.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>

diff --git a/.mailmap b/.mailmap
index 215fe2329cf43b5945a83439db18134f0137e6c2..2ffd23c127b973de1ae6bdbb732941aff55c7470 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -418,6 +418,7 @@ John Stultz <johnstul@us.ibm.com>
 <jon.toppins+linux@gmail.com> <jtoppins@cumulusnetworks.com>
 <jon.toppins+linux@gmail.com> <jtoppins@redhat.com>
 Jonas Gorski <jonas.gorski@gmail.com> <jogo@openwrt.org>
+Jonathan Cameron <jic23@kernel.org> <jonathan.cameron@huawei.com>
 Jordan Crouse <jordan@cosmicpenguin.net> <jcrouse@codeaurora.org>
 <josh@joshtriplett.org> <josh@freedesktop.org>
 <josh@joshtriplett.org> <josh@kernel.org>

diff --git a/MAINTAINERS b/MAINTAINERS
index 1a58c53f76279389cbc897e069829919b708a5dc..ebeb41c67ada3ede100b19805bdd7cbbe7323c58 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6424,7 +6424,7 @@ F:        include/linux/compiler_attributes.h
 
 COMPUTE EXPRESS LINK (CXL)
 M:     Davidlohr Bueso <dave@stgolabs.net>
-M:     Jonathan Cameron <jonathan.cameron@huawei.com>
+M:     Jonathan Cameron <jic23@kernel.org>
 M:     Dave Jiang <dave.jiang@intel.com>
 M:     Alison Schofield <alison.schofield@intel.com>
 M:     Vishal Verma <vishal.l.verma@intel.com>
@@ -6440,7 +6440,7 @@ F:        include/uapi/linux/cxl_mem.h
 F:     tools/testing/cxl/
 
 COMPUTE EXPRESS LINK PMU (CPMU)
-M:     Jonathan Cameron <jonathan.cameron@huawei.com>
+M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-cxl@vger.kernel.org
 S:     Maintained
 F:     Documentation/admin-guide/perf/cxl.rst
@@ -10524,7 +10524,7 @@ FWCTL SUBSYSTEM
 M:     Dave Jiang <dave.jiang@intel.com>
 M:     Jason Gunthorpe <jgg@nvidia.com>
 M:     Saeed Mahameed <saeedm@nvidia.com>
-R:     Jonathan Cameron <Jonathan.Cameron@huawei.com>
+R:     Jonathan Cameron <jic23@kernel.org>
 S:     Maintained
 F:     Documentation/userspace-api/fwctl/
 F:     drivers/fwctl/
@@ -25136,7 +25136,7 @@ F:      drivers/staging/
 
 STANDALONE CACHE CONTROLLER DRIVERS
 M:     Conor Dooley <conor@kernel.org>
-M:     Jonathan Cameron <jonathan.cameron@huawei.com>
+M:     Jonathan Cameron <jic23@kernel.org>
 S:     Maintained
 T:     git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 F:     Documentation/devicetree/bindings/cache/