diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:16:51 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2023-06-25 17:16:51 -0700 |
| commit | aeaefabc59ec3c7edd6d0ca7add7aff2ff6f59d0 (patch) | |
| tree | d733849f230b613a1741dae7d588efbcf700fb27 /tools/perf/scripts/python/exported-sql-viewer.py | |
| parent | 867eab655d3b38740d8d6c24705af25e0b1dbdb6 (diff) | |
| parent | 8f0220af58c3b73e9041377a23708d37600b33c1 (diff) | |
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.
Diffstat (limited to 'tools/perf/scripts/python/exported-sql-viewer.py')
0 files changed, 0 insertions, 0 deletions