diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:53:18 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:53:18 -0700 |
| commit | d2f9fe695313b1e50028c1ec4cd09bea67152a60 (patch) | |
| tree | 4677c0f61ea1192a782ea3c31e4df88b4d12d04d /MAINTAINERS | |
| parent | e2c18eb50c7bb191d1ebfed973c2ec3e0066ad37 (diff) | |
| parent | c2b34d442226b69e519eb0ba61939a74d91712d4 (diff) | |
Merge branch 'for-6.5/cxl-perf' into for-6.5/cxl
Pick up initial support for the CXL 3.0 performance monitoring
definition. Small conflicts with the firmware update work as they both
placed their init code in the same location.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f794002a192e..a0676299d69a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5194,6 +5194,13 @@ S: Maintained F: drivers/cxl/ F: include/uapi/linux/cxl_mem.h +COMPUTE EXPRESS LINK PMU (CPMU) +M: Jonathan Cameron <jonathan.cameron@huawei.com> +L: linux-cxl@vger.kernel.org +S: Maintained +F: Documentation/admin-guide/perf/cxl.rst +F: drivers/perf/cxl_pmu.c + CONEXANT ACCESSRUNNER USB DRIVER L: accessrunner-general@lists.sourceforge.net S: Orphan |