diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-16 15:56:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-16 15:56:01 -0800 |
| commit | 5ffaf037e776fd5095561c27d879b4484549f7e4 (patch) | |
| tree | a2b690dba621ecbef20821d26c159de6b9018ab8 /kernel/time/ntp.c | |
| parent | 8be636dd8a43d4b980c1590afb5a8f5306ac5d31 (diff) | |
| parent | d00dbd29814236ad128ff9517e8f7af6b6ef4ba0 (diff) | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc fixes: a handful of AUX event handling related fixes, a Sparse
fix and two ABI fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Fix missing static inline on perf_cgroup_switch()
perf/core: Consistently fail fork on allocation failures
perf/aux: Disallow aux_output for kernel events
perf/core: Reattach a misplaced comment
perf/aux: Fix the aux_output group inheritance fix
perf/core: Disallow uncore-cgroup events
Diffstat (limited to 'kernel/time/ntp.c')
0 files changed, 0 insertions, 0 deletions