diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:12:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 11:12:48 -0700 |
| commit | bbcdea658f42070d25e7764f1b81785a51cb1642 (patch) | |
| tree | ea5c21c180560918e94aa83a939c9d2507812ff5 /block/blk-settings.c | |
| parent | 8b810a3a35eec9cd5e9245266dd0ae10de063094 (diff) | |
| parent | df6c3db8d30fb1699ccbc403196b86324f4257af (diff) | |
| download | linux-bbcdea658f42070d25e7764f1b81785a51cb1642.tar.bz2 | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two hw-enablement patches, two race fixes, three fixes for regressions
of semantics, plus a number of tooling fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/x86/intel: Add proper condition to run sched_task callbacks
perf/core: Fix locking for children siblings group read
perf/core: Fix scheduling regression of pinned groups
perf/x86/intel: Fix debug_store reset field for freq events
perf/x86/intel: Add Goldmont Plus CPU PMU support
perf/x86/intel: Enable C-state residency events for Apollo Lake
perf symbols: Accept zero as the kernel base address
Revert "perf/core: Drop kernel samples even though :u is specified"
perf annotate: Fix broken arrow at row 0 connecting jmp instruction to its target
perf evsel: State in the default event name if attr.exclude_kernel is set
perf evsel: Fix attr.exclude_kernel setting for default cycles:p
Diffstat (limited to 'block/blk-settings.c')
0 files changed, 0 insertions, 0 deletions