[PATCH] MAINTAINERS: Update Jonathan Cameron's email address

[Jonathan Cameron]

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@xxxxxxxxxx>
---

Any merge route works for this, but given there are two CXL entries,
perhaps that one is most obvious.

 .mailmap    | 1 +
 MAINTAINERS | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.mailmap b/.mailmap
index 22c5ab1c5d55..55be3163f8ea 100644
--- a/.mailmap
+++ b/.mailmap
@@ -419,6 +419,7 @@ John Stultz <johnstul@xxxxxxxxxx>
 <jon.toppins+linux@xxxxxxxxx> <jtoppins@xxxxxxxxxxxxxxxxxxx>
 <jon.toppins+linux@xxxxxxxxx> <jtoppins@xxxxxxxxxx>
 Jonas Gorski <jonas.gorski@xxxxxxxxx> <jogo@xxxxxxxxxxx>
+Jonathan Cameron <jic23@xxxxxxxxxx> <jonathan.cameron@xxxxxxxxxx>
 Jordan Crouse <jordan@xxxxxxxxxxxxxxxxx> <jcrouse@xxxxxxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index d1cc0e12fe1f..558b92f5fbc5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6426,7 +6426,7 @@ F:	include/linux/compiler_attributes.h
 
 COMPUTE EXPRESS LINK (CXL)
 M:	Davidlohr Bueso <dave@xxxxxxxxxxxx>
-M:	Jonathan Cameron <jonathan.cameron@xxxxxxxxxx>
+M:	Jonathan Cameron <jic23@xxxxxxxxxx>
 M:	Dave Jiang <dave.jiang@xxxxxxxxx>
 M:	Alison Schofield <alison.schofield@xxxxxxxxx>
 M:	Vishal Verma <vishal.l.verma@xxxxxxxxx>
@@ -6442,7 +6442,7 @@ F:	include/uapi/linux/cxl_mem.h
 F:	tools/testing/cxl/
 
 COMPUTE EXPRESS LINK PMU (CPMU)
-M:	Jonathan Cameron <jonathan.cameron@xxxxxxxxxx>
+M:	Jonathan Cameron <jic23@xxxxxxxxxx>
 L:	linux-cxl@xxxxxxxxxxxxxxx
 S:	Maintained
 F:	Documentation/admin-guide/perf/cxl.rst
@@ -10539,7 +10539,7 @@ FWCTL SUBSYSTEM
 M:	Dave Jiang <dave.jiang@xxxxxxxxx>
 M:	Jason Gunthorpe <jgg@xxxxxxxxxx>
 M:	Saeed Mahameed <saeedm@xxxxxxxxxx>
-R:	Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
+R:	Jonathan Cameron <jic23@xxxxxxxxxx>
 S:	Maintained
 F:	Documentation/userspace-api/fwctl/
 F:	drivers/fwctl/
@@ -25148,7 +25148,7 @@ F:	drivers/staging/
 
 STANDALONE CACHE CONTROLLER DRIVERS
 M:	Conor Dooley <conor@xxxxxxxxxx>
-M:	Jonathan Cameron <jonathan.cameron@xxxxxxxxxx>
+M:	Jonathan Cameron <jic23@xxxxxxxxxx>
 S:	Maintained
 T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 F:	Documentation/devicetree/bindings/cache/
-- 
2.51.0