From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 17 Nov 2017 22:14:13 +0000 (-0800)
Subject: Merge tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v4.19~2146
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b6b220b0c76f0aa9cb5efb882424a7acc109d898;p=platform%2Fkernel%2Flinux-rpi.git

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
---

b6b220b0c76f0aa9cb5efb882424a7acc109d898