git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: da8380b d18bc74)

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

Merge branch 'for-6.2/cxl-security' into for-6.2/cxl

Pick CXL PMEM security commands for v6.2. Resolve conflicts with the
removal of the cxl_pmem_wq.

drivers/cxl/core/pmem.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/core/region.c	diff1 \|	diff2 \|	blob \| history
drivers/cxl/cxl.h	diff1 \|	diff2 \|	blob \| history
drivers/cxl/cxlmem.h	diff1 \|	diff2 \|	blob \| history
drivers/cxl/pmem.c	diff1 \|	diff2 \|	blob \| history
tools/testing/cxl/Kbuild	diff1 \|	diff2 \|	blob \| history
tools/testing/cxl/test/mem.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git