tree 81dd69220be55d3458f846cd0e1f2c4df116cb66
parent 26db8f992444a87465fc01b264b0317a3943e2b6
parent 857811a37129f5d2ba162d7be3986eff44724014
author Linus Torvalds <torvalds@linux-foundation.org> 1488925991 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1488925991 -0800

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

Pull locking fixes from Ingo Molnar:

 - Change the new refcount_t warnings from WARN() to WARN_ONCE()

 - two ww_mutex fixes

 - plus a new lockdep self-consistency check for a bug that triggered in
   practice

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/ww_mutex: Adjust the lock number for stress test
  locking/lockdep: Add nest_lock integrity test
  locking/ww_mutex: Replace cpu_relax() with cond_resched() for tests
  locking/refcounts: Change WARN() to WARN_ONCE()