Merge tag 'locking_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Sep 2021 18:27:05 +0000 (11:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Sep 2021 18:27:05 +0000 (11:27 -0700)
commit165d05d88c27697fe444a6eae4f3882834ef8826
tree95f60ef99cec11882f5ee9579a6de28eb9fc77c9
parent7bf3142625c193db2dfbd7df2176b7cd910d9e4f
parente5480572706da1b2c2dc2c6484eab64f92b9263b
Merge tag 'locking_urgent_for_v5.15_rc1' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Borislav Petkov:

 - Fix the futex PI requeue machinery to not return to userspace in
   inconsistent state

 - Avoid a potential null pointer dereference in the ww_mutex deadlock
   check

 - Other smaller cleanups and optimizations

* tag 'locking_urgent_for_v5.15_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/rtmutex: Fix ww_mutex deadlock check
  futex: Remove unused variable 'vpid' in futex_proxy_trylock_atomic()
  futex: Avoid redundant task lookup
  futex: Clarify comment for requeue_pi_wake_futex()
  futex: Prevent inconsistent state and exit race
  futex: Return error code instead of assigning it without effect
  locking/rwsem: Add missing __init_rwsem() for PREEMPT_RT