Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Jan 2018 19:20:35 +0000 (11:20 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Jan 2018 19:20:35 +0000 (11:20 -0800)
commit8c76e31a6af1f27f7ccd381757adcae2984eac91
tree203ef348b8b3d86d95e2d98fb237eb5141e85a3c
parentc4e0ca7fa24137e372d6135fe16e8df8e123f116
parent88f1c87de11a86d839f4ce5313e552d96709b990
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Thomas Gleixner:
 "Two final locking fixes for 4.15:

   - Repair the OWNER_DIED logic in the futex code which got wreckaged
     with the recent fix for a subtle race condition.

   - Prevent the hard lockup detector from triggering when dumping all
     held locks in the system"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Avoid triggering hardlockup from debug_show_all_locks()
  futex: Fix OWNER_DEAD fixup