]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branch 'for-7.0/cxl-init' into cxl-for-next
authorDave Jiang <dave.jiang@intel.com>
Fri, 23 Jan 2026 21:13:16 +0000 (14:13 -0700)
committerDave Jiang <dave.jiang@intel.com>
Fri, 23 Jan 2026 21:13:16 +0000 (14:13 -0700)
Merge in patches to support several patch series such as Soft Reserve
handling, type2 accelerator enabling, and LSA 2.1 labeling support.
Mainly addition of cxl_memdev_attach() to allow the memdev probe
to make a decision of proceed/fail depending success of CXL topology
enumeration.

dax/hmem, e820, resource: Defer Soft Reserved insertion until hmem is ready
cxl/mem: Introduce cxl_memdev_attach for CXL-dependent operation
cxl/mem: Drop @host argument to devm_cxl_add_memdev()
cxl/mem: Convert devm_cxl_add_memdev() to scope-based-cleanup
cxl/port: Arrange for always synchronous endpoint attach
cxl/mem: Arrange for always-synchronous memdev attach
cxl/mem: Fix devm_cxl_memdev_edac_release() confusion

1  2 
drivers/cxl/Kconfig
drivers/cxl/cxl.h
drivers/cxl/mem.c
drivers/cxl/pci.c

Simple merge
Simple merge
Simple merge
Simple merge