tree 796921876230866c03dcb3463e633c62e0c99c51
parent 16ecb414101353fd93773a47d39eac4b93af02e9
parent fba7cd681b6155e2d93e7862fcd6f970336b83c3
author Linus Torvalds <torvalds@linux-foundation.org> 1461436788 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1461436788 -0700

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "Misc fixes:

  pvqspinlocks:
   - an instrumentation fix

  futexes:
   - preempt-count vs pagefault_disable decouple corner case fix
   - futex requeue plist race window fix
   - futex UNLOCK_PI transaction fix for a corner case"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  asm-generic/futex: Re-enable preemption in futex_atomic_cmpxchg_inatomic()
  futex: Acknowledge a new waiter in counter before plist
  futex: Handle unlock_pi race gracefully
  locking/pvqspinlock: Fix division by zero in qstat_read()