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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 95dddcb 6155ccc)

author	Dan Williams <dan.j.williams@intel.com>
	Mon, 5 Dec 2022 20:31:30 +0000 (12:31 -0800)
committer	Dan Williams <dan.j.williams@intel.com>
	Mon, 5 Dec 2022 20:31:30 +0000 (12:31 -0800)
commit	e0f6fa0d425f745a887e640be66e22b45451e169
tree	be40c3330600fd5dad459161780cf3d5a0619318	tree \| snapshot
parent	95dddcb5e86381abddeb1ccab5b5826fdcc74c70	commit \| diff
parent	6155ccc9ddf6642056f1c00c2851d1938d27a7f2	commit \| diff

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.

drivers/cxl/core/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/port.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/regs.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/cxl.h	diff1 \|	diff2 \|	blob \| history
drivers/cxl/cxlmem.h	diff1 \|	diff2 \|	blob \| history
drivers/cxl/pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;