From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Oct 2017 06:45:40 +0000 (+0200)
Subject: Merge tag 'xfs-4.14-fixes-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v4.14-rc7~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ed590271a65b0fbe3eb1cf828ad5af16603c8ce;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'xfs-4.14-fixes-7' of git://git./fs/xfs/xfs-linux

Pull xfs fix from Darrick Wong:
 "Here's (hopefully) the last bugfix for 4.14:

   - Rework nowait locking code to reduce locking overhead penalty"

* tag 'xfs-4.14-fixes-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix AIM7 regression
---

4ed590271a65b0fbe3eb1cf828ad5af16603c8ce