]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-6.5/cxl-perf' into for-6.5/cxl
authorDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 00:53:18 +0000 (17:53 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 00:53:18 +0000 (17:53 -0700)
commitd2f9fe695313b1e50028c1ec4cd09bea67152a60
tree4677c0f61ea1192a782ea3c31e4df88b4d12d04d
parente2c18eb50c7bb191d1ebfed973c2ec3e0066ad37
parentc2b34d442226b69e519eb0ba61939a74d91712d4
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.
MAINTAINERS
drivers/cxl/Kconfig
drivers/cxl/core/port.c
drivers/cxl/core/regs.c
drivers/cxl/cxl.h
drivers/cxl/pci.c
tools/testing/cxl/Kbuild