]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - rpmsg/hwspinlock.git/commitdiff
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)
1  2 
drivers/dax/super.c
drivers/nvdimm/pmem.c
fs/xfs/xfs_file.c
include/linux/mm.h
mm/Kconfig
mm/gup.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/Kconfig
Simple merge
diff --cc mm/gup.c
Simple merge