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

Pull locking updates from Ingo Molnar:
 "The main changes in this cycle were:

   - a big round of FUTEX_UNLOCK_PI improvements, fixes, cleanups and
     general restructuring

   - lockdep updates such as new checks for lock_downgrade()

   - introduce the new atomic_try_cmpxchg() locking API and use it to
     optimize refcount code generation

   - ... plus misc fixes, updates and cleanups"

* 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (38 commits)
  MAINTAINERS: Add FUTEX SUBSYSTEM
  futex: Clarify mark_wake_futex memory barrier usage
  futex: Fix small (and harmless looking) inconsistencies
  futex: Avoid freeing an active timer
  rtmutex: Plug preempt count leak in rt_mutex_futex_unlock()
  rtmutex: Fix more prio comparisons
  rtmutex: Fix PI chain order integrity
  sched,tracing: Update trace_sched_pi_setprio()
  sched/rtmutex: Refactor rt_mutex_setprio()
  rtmutex: Clean up
  sched/deadline/rtmutex: Dont miss the dl_runtime/dl_period update
  sched/rtmutex/deadline: Fix a PI crash for deadline tasks
  rtmutex: Deboost before waking up the top waiter
  locking/ww-mutex: Limit stress test to 2 seconds
  locking/atomic: Fix atomic_try_cmpxchg() semantics
  lockdep: Fix per-cpu static objects
  futex: Drop hb->lock before enqueueing on the rtmutex
  futex: Futex_unlock_pi() determinism
  futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()
  futex,rt_mutex: Restructure rt_mutex_finish_proxy_lock()
  ...

1 files changed, 17 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f05023510253..33ecf266570f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5415,6 +5415,23 @@ F:	fs/fuse/
 F:      include/uapi/linux/fuse.h
 F:      Documentation/filesystems/fuse.txt
 
+FUTEX SUBSYSTEM
+M:      Thomas Gleixner <tglx@linutronix.de>
+M:      Ingo Molnar <mingo@redhat.com>
+R:      Peter Zijlstra <peterz@infradead.org>
+R:      Darren Hart <dvhart@infradead.org>
+L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
+S:      Maintained
+F:      kernel/futex.c
+F:      kernel/futex_compat.c
+F:      include/asm-generic/futex.h
+F:      include/linux/futex.h
+F:      include/uapi/linux/futex.h
+F:      tools/testing/selftests/futex/
+F:      tools/perf/bench/futex*
+F:      Documentation/*futex*
+
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 M:      Rik Faith <faith@cs.unc.edu>
 L:      linux-scsi@vger.kernel.org