| commit | 05bbb9360a000f509537a84554d69fb891fa7332 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 25 10:03:32 2019 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Aug 25 10:03:32 2019 -0700 |
| tree | 3d603240fef76b6aa43823e202326202bb3b96d7 | |
| parent | 44c471e43698d966d2bf291a9631f7d22a861bbd [diff] | |
| parent | f1c6ece23729257fb46562ff9224cf5f61b818da [diff] |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"Two small fixes for kprobes and perf:
- Prevent a deadlock in kprobe_optimizer() causes by reverse lock
ordering
- Fix a comment typo"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kprobes: Fix potential deadlock in kprobe_optimizer()
perf/x86: Fix typo in comment