Michael Ellerman ebf0b6a8b1 Merge branch 'fixes' into next ... Merge our fixes branch from the 4.15 cycle. Unusually the fixes branch saw some significant features merged, notably the RFI flush patches, so we want the code in next to be tested against that, to avoid any surprises when the two are merged. There's also some other work on the panic handling that was reverted in fixes and we now want to do properly in next, which would conflict. And we also fix a few other minor merge conflicts.		2018-01-21 23:21:14 +11:00
..
req-gen	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
8xx-pmu.c	powerpc/8xx: Only perform perf counting when perf is in use.	2018-01-16 23:47:12 +11:00
bhrb.S	powerpc/perf: Add basic assembly code to read BHRB entries on POWER8	2013-04-26 16:11:11 +10:00
callchain.c	powerpc/mm: Rename find_linux_pte_or_hugepte()	2017-08-17 23:13:46 +10:00
core-book3s.c	Merge branch 'fixes' into next	2018-01-21 23:21:14 +11:00
core-fsl-emb.c	perf/powerpc: reset event hw state when adding it to the PMU	2015-01-29 23:44:18 -06:00
e500-pmu.c	powerpc/perf: Add stalled-cycles events	2013-01-10 17:00:56 +11:00
e6500-pmu.c	powerpc/perf: Add e6500 PMU driver	2013-08-07 18:38:04 -05:00
hv-24x7-catalog.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-24x7-domains.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-24x7.c	powerpc/perf/hv-24x7: Fix incorrect comparison in memord	2017-10-22 12:08:31 +02:00
hv-24x7.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-common.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-common.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-gpci-requests.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
hv-gpci.c	powerpc/sparse: Make a bunch of things static	2016-09-13 17:35:47 +10:00
hv-gpci.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
imc-pmu.c	Merge branch 'fixes' into next	2018-01-21 23:21:14 +11:00
isa207-common.c	powerpc/perf: Factor out PPMU_ONLY_COUNT_RUN check code from power8	2017-08-10 22:30:05 +10:00
isa207-common.h	powerpc/perf: Factor out PPMU_ONLY_COUNT_RUN check code from power8	2017-08-10 22:30:05 +10:00
Makefile	powerpc/8xx: Only perform perf counting when perf is in use.	2018-01-16 23:47:12 +11:00
mpc7450-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00
perf_regs.c	powerpc/perf: Fix oops when kthread execs user process	2017-06-16 21:02:46 +10:00
power4-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00
power5-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00
power5+-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00
power6-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00
power7-events-list.h	powerpc/perf: Make some new raw event codes available in sysfs	2014-03-24 09:48:23 +11:00
power7-pmu.c	powerpc/sparse: Make a bunch of things static	2016-09-13 17:35:47 +10:00
power8-events-list.h	powerpc/perf: Add Power8 mem_access event to sysfs	2017-04-19 20:00:23 +10:00
power8-pmu.c	powerpc/perf: Factor out PPMU_ONLY_COUNT_RUN check code from power8	2017-08-10 22:30:05 +10:00
power9-events-list.h	powerpc/perf: Cleanup of PM_BR_CMPL vs. PM_BRU_CMPL in Power9 event list	2017-08-10 22:30:06 +10:00
power9-pmu.c	powerpc/perf: Cleanup of PM_BR_CMPL vs. PM_BRU_CMPL in Power9 event list	2017-08-10 22:30:06 +10:00
ppc970-pmu.c	powerpc/perf: Pass the struct perf_events down to compute_mmcr()	2014-07-28 14:30:47 +10:00