From: Linus Torvalds Date: Sat, 15 Jul 2017 05:57:32 +0000 (-0700) Subject: Merge tag 'xfs-4.13-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux X-Git-Tag: v4.14-rc1~450 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a80099a152d0719e2d8d750e07f4ffa991553d30;p=platform%2Fkernel%2Flinux-rpi3.git Merge tag 'xfs-4.13-merge-6' of git://git./fs/xfs/xfs-linux Pull XFS fixes from Darrick Wong: "Largely debugging and regression fixes. - Add some locking assertions for the _ilock helpers. - Revert the XFS_QMOPT_NOLOCK patch; after discussion with hch the online fsck patch that would have needed it has been redesigned and no longer needs it. - Fix behavioral regression of SEEK_HOLE/DATA with negative offsets to match 4.12-era XFS behavior" * tag 'xfs-4.13-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: vfs: in iomap seek_{hole,data}, return -ENXIO for negative offsets Revert "xfs: grab dquots without taking the ilock" xfs: assert locking precondition in xfs_readlink_bmap_ilocked xfs: assert locking precondŃ–tion in xfs_attr_list_int_ilocked xfs: fixup xfs_attr_get_ilocked --- a80099a152d0719e2d8d750e07f4ffa991553d30