| commit | e0ed1c22d480a3b5ec5fce4e5399cf4481da95a6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 18 09:04:17 2016 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Oct 18 09:04:17 2016 -0700 |
| tree | f8750b76d55bcfe6c0d81678d2d87ccf92ad9e62 | |
| parent | 50276c9abb9c236a359854f30eb8bb81fd14a22d [diff] | |
| parent | 5f43086bb9224987010460dcf3dee68fbd4f574d [diff] |
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:
- 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()