summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2023-10-31 10:59:44 -0700
committerDan Williams <dan.j.williams@intel.com>2023-10-31 10:59:44 -0700
commitde5512b2a293863261c6b04c0c73ec0ec09ed550 (patch)
treee5cfd738515e0d64adf7a4e9548c7f6f5ec738b2 /MAINTAINERS
parent624eda92abd47f35386028e4a54d423037a75d12 (diff)
parentfae6389f912eb0b6aea1366814b5501077b5dbac (diff)
downloadlinux-stable-de5512b2a293863261c6b04c0c73ec0ec09ed550.tar.gz
linux-stable-de5512b2a293863261c6b04c0c73ec0ec09ed550.tar.bz2
linux-stable-de5512b2a293863261c6b04c0c73ec0ec09ed550.zip
Merge branch 'for-6.7/cxl' into cxl/next
Pickup some misc. CXL updates for v6.7.
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c6b08ec50109..b73d088bd939 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5183,6 +5183,7 @@ L: linux-cxl@vger.kernel.org
S: Maintained
F: drivers/cxl/
F: include/uapi/linux/cxl_mem.h
+F: tools/testing/cxl/
COMPUTE EXPRESS LINK PMU (CPMU)
M: Jonathan Cameron <jonathan.cameron@huawei.com>