Merge branch 'for-4.17/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:17 +0000 (10:50 -0700)
1  2 
drivers/md/dm.c
drivers/nvdimm/Kconfig
include/linux/fs.h
kernel/sched/core.c
kernel/sched/debug.c
kernel/workqueue.c

diff --cc drivers/md/dm.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge