diff options
| author | Dave Jiang <dave.jiang@intel.com> | 2026-04-15 18:16:31 +0300 |
|---|---|---|
| committer | Dave Jiang <dave.jiang@intel.com> | 2026-04-15 18:16:31 +0300 |
| commit | 6c724ce0ec6ed8608917673bbb363b208ce2644c (patch) | |
| tree | 3ea6074858c797d301d73a33c9aafd6a3331aef5 | |
| parent | 3939dba00f981c26d1748769f2f28a3cc0afb6a8 (diff) | |
| parent | dc989bb79380194917351284167f78c3aa084c94 (diff) | |
| download | linux-6c724ce0ec6ed8608917673bbb363b208ce2644c.tar.xz | |
Merge branch 'for-7.1/cxl-misc' into cxl-for-next
MAINTAINERS: Update Jonathan Cameron's email address
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -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 1a58c53f7627..ebeb41c67ada 100644 --- 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/ |