diff options
author | Dan Williams <dan.j.williams@intel.com> | 2022-12-05 12:31:30 -0800 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2022-12-05 12:31:30 -0800 |
commit | e0f6fa0d425f745a887e640be66e22b45451e169 (patch) | |
tree | be40c3330600fd5dad459161780cf3d5a0619318 /drivers/acpi | |
parent | 95dddcb5e86381abddeb1ccab5b5826fdcc74c70 (diff) | |
parent | 6155ccc9ddf6642056f1c00c2851d1938d27a7f2 (diff) | |
download | linux-stable-e0f6fa0d425f745a887e640be66e22b45451e169.tar.gz linux-stable-e0f6fa0d425f745a887e640be66e22b45451e169.tar.bz2 linux-stable-e0f6fa0d425f745a887e640be66e22b45451e169.zip |
Merge branch 'for-6.2/cxl-aer' into for-6.2/cxl
Pick up CXL AER handling and correctable error extensions. Resolve
conflicts with cxl_pmem_wq reworks and RCH support.
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions