projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c8636b9 95989c4)
Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jun 2017 08:34:41 +0000 (17:34 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jun 2017 08:34:41 +0000 (17:34 +0900)
commitadc311034c356e884d180df25deb046cef3e8c75
tree01c21bf6c26c47f30f710528d494c001379525c9tree | snapshot
parentc8636b90a091331beb0a26c455a0c87b93aa774acommit | diff
parent95989c46d2a156365867b1d795fdefce71bce378commit | diff
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
Linux Project Source (from git://github.com/torvalds/linux)