Merge branch 'for-4.17/dax' into libnvdimm-for-next

author Dan Williams <dan.j.williams@intel.com>

Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)

committer Dan Williams <dan.j.williams@intel.com>

Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
author Dan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
committer Dan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
diff --cc drivers/md/dm.c
Simple merge
diff --cc drivers/nvdimm/Kconfig
Simple merge
diff --cc include/linux/fs.h
Simple merge
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/sched/debug.c
Simple merge
diff --cc kernel/workqueue.c
Simple merge
author	Dan Williams <dan.j.williams@intel.com>
	Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
committer	Dan Williams <dan.j.williams@intel.com>
	Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
		1	2
drivers/md/dm.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvdimm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/debug.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	patch \|	diff1 \|	diff2 \|	blob \| history