Ingo Molnar 15bcdc9477 Merge branch 'linus' into perf/core, to fix conflicts ...

Conflicts:
	tools/perf/arch/arm/annotate/instructions.c
	tools/perf/arch/arm64/annotate/instructions.c
	tools/perf/arch/powerpc/annotate/instructions.c
	tools/perf/arch/s390/annotate/instructions.c
	tools/perf/arch/x86/tests/intel-cqm.c
	tools/perf/ui/tui/progress.c
	tools/perf/util/zlib.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:30:18 +01:00

..

callchain.c

perf/callchain: Force USER_DS when invoking perf_callchain_user()

2017-05-10 07:54:00 +02:00

core.c

Merge branch 'linus' into perf/core, to fix conflicts

2017-11-07 10:30:18 +01:00

hw_breakpoint.c

perf: Collapse and fix event_function_call() users

2016-01-21 18:54:24 +01:00

internal.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

ring_buffer.c

perf/aux: Only update ->aux_wakeup in non-overwrite mode

2017-09-29 10:06:45 +02:00

uprobes.c

mm, uprobes: fix multiple free of ->uprobes_state.xol_area

2017-08-31 16:33:15 -07:00