]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-6.3/cxl-rr-emu' into cxl/next
authorDan Williams <dan.j.williams@intel.com>
Wed, 15 Feb 2023 00:06:10 +0000 (16:06 -0800)
committerDan Williams <dan.j.williams@intel.com>
Wed, 15 Feb 2023 00:06:10 +0000 (16:06 -0800)
commita5fcd228ca1db9810ba1ed461c90b6ee933b9daf
tree814f208a81af8e90bff8619e2eed5d167b400dd2
parent5a6fe61facdb7f830895712b31fb39f544ffc165
parent6980daaa3ed5959bf4fe2719d96b1da437026b58
Merge branch 'for-6.3/cxl-rr-emu' into cxl/next

Pick up the CXL DVSEC range register emulation for v6.3, and resolve
conflicts with the cxl_port_probe() split (from for-6.3/cxl-ram-region)
and event handling (from for-6.3/cxl-events).
drivers/cxl/core/hdm.c
drivers/cxl/core/pci.c
drivers/cxl/cxl.h
drivers/cxl/cxlmem.h
drivers/cxl/cxlpci.h
drivers/cxl/port.c
tools/testing/cxl/Kbuild
tools/testing/cxl/test/cxl.c