From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Mar 2018 17:18:31 +0000 (-1000)
Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.16-rc7~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bacf660776396d43e349817574715bbf229b8ab;p=thirdparty%2Fkernel%2Flinux.git

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

Pull locking fixes from Ingo Molnar:
 "Two fixes: tighten up a jump-labels warning to not trigger on certain
  modules and fix confusing (and non-existent) mutex API documentation"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  jump_label: Disable jump labels in __exit code
  locking/mutex: Improve documentation
---

6bacf660776396d43e349817574715bbf229b8ab