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

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