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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 711442e 623c075)

author	Dan Williams <dan.j.williams@intel.com>
	Tue, 7 Feb 2023 19:12:24 +0000 (11:12 -0800)
committer	Dan Williams <dan.j.williams@intel.com>
	Tue, 7 Feb 2023 19:12:24 +0000 (11:12 -0800)
commit	5485eb955994a238eafd08d9266005b1c9ac7991
tree	fad2a31e1f9340de6aecbec16fa18509409ff5d1	tree \| snapshot
parent	711442e29f16f0d39dd0e2460c9baacfccb9d5a7	commit \| diff
parent	623c0751336e4035ab0047f2c152a02bd26b612b	commit \| diff

Merge branch 'for-6.3/cxl' into cxl/next

Merge the general CXL updates with fixes targeting v6.2-rc for v6.3.
Resolve a conflict with the fix and move of cxl_report_and_clear() from
pci.c to core/pci.c.

drivers/cxl/acpi.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/region.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;