| commit | adc311034c356e884d180df25deb046cef3e8c75 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 17 17:34:41 2017 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jun 17 17:34:41 2017 +0900 |
| tree | 01c21bf6c26c47f30f710528d494c001379525c9 | |
| parent | c8636b90a091331beb0a26c455a0c87b93aa774a [diff] | |
| parent | 95989c46d2a156365867b1d795fdefce71bce378 [diff] |
Merge tag 'xfs-4.12-fixes-4' of git://git.kernel.org/pub/scm/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