Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
authorDave Chinner <david@fromorbit.com>
Wed, 30 Nov 2016 01:49:38 +0000 (12:49 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 30 Nov 2016 01:49:38 +0000 (12:49 +1100)
commite3df41f97847f60c3808b39dee1adcb72b3d4646
treee146ce6480868f74bb1fdf31ac522ae1aece648d
parent9484ab1bf4464faae695321dd4fa66365beda74e
parentf782088c9e5d08e9494c63e68b4e85716df3e5f8
Merge branch 'xfs-4.10-misc-fixes-2' into iomap-4.10-directio
fs/iomap.c
fs/xfs/xfs_aops.c
fs/xfs/xfs_file.c
include/linux/iomap.h