review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e0f6fa0 7a7e6ed)

author	Dan Williams <dan.j.williams@intel.com>
	Mon, 5 Dec 2022 20:32:11 +0000 (12:32 -0800)
committer	Dan Williams <dan.j.williams@intel.com>
	Mon, 5 Dec 2022 20:32:11 +0000 (12:32 -0800)
commit	02fedf1466567424c336cd11cf368dcf78f2af33
tree	713216a735619af0852b7bdf725271cc0ef8a5b2	tree \| snapshot
parent	e0f6fa0d425f745a887e640be66e22b45451e169	commit \| diff
parent	7a7e6edfca857f490e3a963198c67620de26b7f0	commit \| 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.

drivers/cxl/acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/port.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/cxl.h	diff1 \|	diff2 \|	blob \| history
tools/testing/cxl/test/cxl.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;