Merge branch 'xfs-4.8-split-dax-dio' into for-next
authorDave Chinner <david@fromorbit.com>
Wed, 20 Jul 2016 01:54:37 +0000 (11:54 +1000)
committerDave Chinner <david@fromorbit.com>
Wed, 20 Jul 2016 01:54:37 +0000 (11:54 +1000)
commitb47ec80bfe1eadd530a13522890d43d71eda10f8
tree29e95ca6aebb2f6a911fdfb33cdf8f5b794c1779
parentbbfeb6141fcc8e2aea47b2f235cc8cc8ffb4a293
parent16d4d43595b4780daac8fcea6d042689124cb094
Merge branch 'xfs-4.8-split-dax-dio' into for-next
fs/xfs/xfs_aops.c
fs/xfs/xfs_file.c
fs/xfs/xfs_inode.h
fs/xfs/xfs_ioctl.c
fs/xfs/xfs_trace.h