Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
commit805f286907ace68bef37db20bbdfa8f4a1908ed9
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 15:59:37 +0000 (27 08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 27 May 2017 15:59:37 +0000 (27 08:59 -0700)
tree6481acfb89ec98bb87f9f22a1b666b25234c5c41
parentd024baa58a4a7e5eb6058017771d15b9e47b56db
parent04dc1b2fff4e96cb4142227fbdc63c8871ad4ed9
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fix from Thomas Gleixner:
 "A fix for a state leak which was introduced in the recent rework of
  futex/rtmutex interaction"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()