diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-10 09:44:52 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-10 09:44:52 -0800 |
commit | d2a6aae99f5fa2f1e7e400bd2f17c1d42c50312a (patch) | |
tree | a9caaf7dedf8857952bba7400d81c1b3d4233a64 /arch/x86/events/msr.c | |
parent | df3865f8f56879b7e9f0ca47fa7bc5f2252df6d3 (diff) | |
parent | 1a1fb985f2e2b85ec0d3dc2e519ee48389ec2434 (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:
"An rtmutex (PI-futex) deadlock scenario fix, plus a locking
documentation fix"
* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
futex: Handle early deadlock return correctly
futex: Fix barrier comment
Diffstat (limited to 'arch/x86/events/msr.c')
0 files changed, 0 insertions, 0 deletions