git.kernel.dk Git - linux-2.6-block.git/commit

projects / linux-2.6-block.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d121f07 f81e1d3)

author	Ross Zwisler <ross.zwisler@linux.intel.com>
	Sat, 3 Feb 2018 07:26:26 +0000 (00:26 -0700)
committer	Ross Zwisler <ross.zwisler@linux.intel.com>
	Sat, 3 Feb 2018 07:26:26 +0000 (00:26 -0700)
commit	ee95f4059a833839bf52972191b2d4c3d3cec552
tree	a1c8587d9b82e64a75dde376a90a3d69b0f4847a	tree \| snapshot
parent	d121f07691415df824e6b60520f782f6d13b3c81	commit \| diff
parent	f81e1d35a6e36d30888c46283b8dd1022e847124	commit \| diff

Merge branch 'for-4.16/nfit' into libnvdimm-for-next

drivers/acpi/nfit/core.c	diff1 \|	diff2 \|	blob \| history
drivers/nvdimm/pmem.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
mm/sparse.c	diff1 \|	diff2 \|	blob \| history
tools/testing/nvdimm/test/nfit.c	diff1 \|	diff2 \|	blob \| history

Linux 6.x block layer and io_uring tree(s)