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

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

Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)

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

Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
author Dan Williams <dan.j.williams@intel.com>
Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
committer Dan Williams <dan.j.williams@intel.com>
Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
diff --cc drivers/dax/super.c
Simple merge
diff --cc drivers/nvdimm/pmem.c
Simple merge
diff --cc fs/xfs/xfs_file.c
Simple merge
diff --cc include/linux/mm.h
Simple merge
diff --cc mm/Kconfig
Simple merge
diff --cc mm/gup.c
Simple merge
author	Dan Williams <dan.j.williams@intel.com>
	Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
committer	Dan Williams <dan.j.williams@intel.com>
	Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
		1	2
drivers/dax/super.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvdimm/pmem.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	patch \|	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
mm/gup.c	patch \|	diff1 \|	diff2 \|	blob \| history