From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Apr 2016 18:39:48 +0000 (-0700)
Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~3395
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0e11d256512c5166e03c9e9f221f9371bd42911e;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'locking-urgent-for-linus' of git://git./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()
---

0e11d256512c5166e03c9e9f221f9371bd42911e