Merge tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 22:14:13 +0000 (14:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 17 Nov 2017 22:14:13 +0000 (14:14 -0800)
commitb6b220b0c76f0aa9cb5efb882424a7acc109d898
tree1482c2ce0d6dab9777b5a0d5a23ceedf5efad4ce
parentb04a23421bf63d3fde3227041b31e39cb5b5349d
parent2015a63dce8d73a439232a0d5162c88d8513101e
Merge tag 'xfs-4.15-merge-2' of git://git./fs/xfs/xfs-linux

Pull xfs fixes from Darrick Wong:
 "A couple more patches to fix a locking bug and some inconsistent type
  usage in some of the new code:

   - Fix a forgotten rcu read unlock

   - Fix some inconsistent integer type usage"

* tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix type usage
  xfs: fix forgotten rcu read unlock when skipping inode reclaim