]> git.itanic.dy.fi Git - linux-stable/commit
Merge branch 'for-6.5/cxl-rch-eh' into for-6.5/cxl
authorDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 01:56:13 +0000 (18:56 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 26 Jun 2023 01:56:13 +0000 (18:56 -0700)
commit0c0df63177e37ae826d803280eb2c5b6b6a7a9a4
tree5b158934251cb6537491371d3dd09fcf349a3102
parentd2f9fe695313b1e50028c1ec4cd09bea67152a60
parent5d2ffbe4b81a3b6353bf888a523e7e5d4fec47ad
Merge branch 'for-6.5/cxl-rch-eh' into for-6.5/cxl

Pick up the first half of the RCH error handling series. The back half
needs some fixups for test regressions. Small conflicts with the PMU
work around register enumeration and setup helpers.
15 files changed:
drivers/cxl/acpi.c
drivers/cxl/core/core.h
drivers/cxl/core/hdm.c
drivers/cxl/core/pci.c
drivers/cxl/core/port.c
drivers/cxl/core/region.c
drivers/cxl/core/regs.c
drivers/cxl/cxl.h
drivers/cxl/cxlmem.h
drivers/cxl/mem.c
drivers/cxl/pci.c
drivers/cxl/port.c
tools/testing/cxl/Kbuild
tools/testing/cxl/test/cxl.c
tools/testing/cxl/test/mock.c