| commit | 02fedf1466567424c336cd11cf368dcf78f2af33 | [log] [tgz] |
|---|---|---|
| author | Dan Williams <dan.j.williams@intel.com> | Mon Dec 05 12:32:11 2022 -0800 |
| committer | Dan Williams <dan.j.williams@intel.com> | Mon Dec 05 12:32:11 2022 -0800 |
| tree | 713216a735619af0852b7bdf725271cc0ef8a5b2 | |
| parent | e0f6fa0d425f745a887e640be66e22b45451e169 [diff] | |
| parent | 7a7e6edfca857f490e3a963198c67620de26b7f0 [diff] |
Merge branch 'for-6.2/cxl-xor' into for-6.2/cxl Pick up support for "XOR" interleave math when parsing ACPI CFMWS window structures. Fix up conflicts with the RCH emulation already pending in cxl/next.