]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-6.5/cxl-type-2' into for-6.5/cxl
authorDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 00:16:51 +0000 (17:16 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 00:16:51 +0000 (17:16 -0700)
commitaeaefabc59ec3c7edd6d0ca7add7aff2ff6f59d0
treed733849f230b613a1741dae7d588efbcf700fb27
parent867eab655d3b38740d8d6c24705af25e0b1dbdb6
parent8f0220af58c3b73e9041377a23708d37600b33c1
Merge branch 'for-6.5/cxl-type-2' into for-6.5/cxl

Pick up the driver cleanups identified in preparation for CXL "type-2"
(accelerator) device support. The major change here from a conflict
generation perspective is the split of 'struct cxl_memdev_state' from
the core 'struct cxl_dev_state'. Since an accelerator may not care about
all the optional features that are standard on a CXL "type-3" (host-only
memory expander) device.

A silent conflict also occurs with the move of the endpoint port to be a
formal property of a 'struct cxl_memdev' rather than drvdata.
drivers/cxl/core/mbox.c
drivers/cxl/core/memdev.c
drivers/cxl/cxl.h
drivers/cxl/cxlmem.h
drivers/cxl/pci.c
drivers/cxl/security.c
tools/testing/cxl/test/mem.c