Merge commit 'tip/perfcounters/core' into perf-counters-for-linus