From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jun 2017 08:34:41 +0000 (+0900)
Subject: Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
X-Git-Tag: v4.14-rc1~727
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adc311034c356e884d180df25deb046cef3e8c75;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'xfs-4.12-fixes-4' of git://git./fs/xfs/xfs-linux

Pull xfs fix from Darrick Wong:
 "One more bugfix for you for 4.12-rc6 to fix something that came up in
  an earlier rc:

   - Fix some bogus ASSERT failures on CONFIG_SMP=n and CONFIG_XFS_DEBUG=y"

* tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix spurious spin_is_locked() assert failures on non-smp kernels
---

adc311034c356e884d180df25deb046cef3e8c75