Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Oct 2016 16:04:17 +0000 (09:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 Oct 2016 16:04:17 +0000 (09:04 -0700)
commite0ed1c22d480a3b5ec5fce4e5399cf4481da95a6
treef8750b76d55bcfe6c0d81678d2d87ccf92ad9e62
parent50276c9abb9c236a359854f30eb8bb81fd14a22d
parent5f43086bb9224987010460dcf3dee68fbd4f574d
Merge branch 'locking-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull locking fixes from Ingo Molnar:
 "Two fixes:

   - a file locks fix (missing critical section, bug introduced in this
     merge window)

   - an x86 down_write() stack frame annotation"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking, fs/locks: Add missing file_sem locks
  locking/rwsem/x86: Add stack frame dependency for ____down_write()