Merge branch 'for-4.18/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 8 Jun 2018 22:16:40 +0000 (15:16 -0700)
commitb56845794e1e93121acb74ca325db965035d5545
tree3435f4e8de92d5a63fdc15953391cf057ee46642
parent808c340be17dc77131fcdf9ad1eb34452d650da1
parentcc4a90ac816e00775fbc2a9c018bf2af606abd06
Merge branch 'for-4.18/dax' into libnvdimm-for-next
drivers/dax/super.c
drivers/nvdimm/pmem.c
fs/xfs/xfs_file.c
include/linux/mm.h
mm/Kconfig
mm/gup.c