OSDN Git Service

Merge branch 'for-6.3/cxl' into cxl/next
authorDan Williams <dan.j.williams@intel.com>
Tue, 7 Feb 2023 19:12:24 +0000 (11:12 -0800)
committerDan Williams <dan.j.williams@intel.com>
Tue, 7 Feb 2023 19:12:24 +0000 (11:12 -0800)
commit5485eb955994a238eafd08d9266005b1c9ac7991
treefad2a31e1f9340de6aecbec16fa18509409ff5d1
parent711442e29f16f0d39dd0e2460c9baacfccb9d5a7
parent623c0751336e4035ab0047f2c152a02bd26b612b
Merge branch 'for-6.3/cxl' into cxl/next

Merge the general CXL updates with fixes targeting v6.2-rc for v6.3.
Resolve a conflict with the fix and move of cxl_report_and_clear() from
pci.c to core/pci.c.
drivers/cxl/acpi.c
drivers/cxl/core/pci.c
drivers/cxl/core/region.c