diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-06 03:20:54 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-06-06 03:20:54 +0300 |
| commit | bcc8fa83136969c340a8057c44b1d5eb2f4b5295 (patch) | |
| tree | 7fda3b145b4d9f044553e82928a508e44b22babc /arch/arm/mach-hisi | |
| parent | 4c9e0f76a55a38757390d43c40b2c7c3564a855a (diff) | |
| parent | 74cf0bc75f1671b8da3b2e6ef7b2dc75cab0016a (diff) | |
| download | linux-bcc8fa83136969c340a8057c44b1d5eb2f4b5295.tar.xz | |
Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
There's quite a lot here, most of it from Mark Rutland, who has been
working on big.LITTLE PMU support for a while now. His work also brings
us significantly closer to moving the bulk of the CPU PMU driver out
into drivers/, where it can be shared with arm64.
As part of this work, there is a small patch to perf/core, which has
been Acked-by PeterZ and doesn't conflict with tip/perf/core at present.
I've kept that patch on a separate branch, merged in here, so that the
tip guys can pull it too if any unexpected issues crop up.
Please note that there is a conflict with mainline, since we remove
perf_event_cpu.c. The correct resolution is also to remove the file,
since the changes there are already reflected in the rework (and this
resolution is already included in linux-next).
Diffstat (limited to 'arch/arm/mach-hisi')
0 files changed, 0 insertions, 0 deletions