]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9f7bcb1 e3247ce)
Merge branch 'linus' into perf/core, to fix conflicts
authorIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:30:18 +0000 (10:30 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 7 Nov 2017 09:30:18 +0000 (10:30 +0100)
commit90420c6a57b87de27667daae1d19eb15fd59da78
treee1e3c1f2b89e3a705d1737d61a4d8a9394a1930etree | snapshot
parent9f7bcb1b58f207d87d8dd54e083f87b565114f88commit | diff
parente3247ce536acf88e2881ff6a672ca1495881e442commit | diff
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>
93 files changed:
arch/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/kprobes/common.h diff1 | diff2 | blob | history
kernel/events/core.c diff1 | diff2 | blob | history
tools/include/linux/poison.h diff1 | diff2 | blob | history
tools/perf/arch/arm/annotate/instructions.c diff1 | diff2 | blob | history
tools/perf/arch/arm64/annotate/instructions.c diff1 | diff2 | blob | history
tools/perf/arch/powerpc/annotate/instructions.c diff1 | diff2 | blob | history
tools/perf/arch/s390/annotate/instructions.c diff1 | diff2 | blob | history
tools/perf/arch/x86/annotate/instructions.c diff1 | diff2 | blob | history
tools/perf/arch/x86/include/arch-tests.h diff1 | diff2 | blob | history
tools/perf/arch/x86/tests/arch-tests.c diff1 | diff2 | blob | history
tools/perf/builtin-annotate.c diff1 | diff2 | blob | history
tools/perf/builtin-buildid-cache.c diff1 | diff2 | blob | history
tools/perf/builtin-buildid-list.c diff1 | diff2 | blob | history
tools/perf/builtin-c2c.c diff1 | diff2 | blob | history
tools/perf/builtin-config.c diff1 | diff2 | blob | history
tools/perf/builtin-diff.c diff1 | diff2 | blob | history
tools/perf/builtin-evlist.c diff1 | diff2 | blob | history
tools/perf/builtin-inject.c diff1 | diff2 | blob | history
tools/perf/builtin-kmem.c diff1 | diff2 | blob | history
tools/perf/builtin-kvm.c diff1 | diff2 | blob | history
tools/perf/builtin-list.c diff1 | diff2 | blob | history
tools/perf/builtin-lock.c diff1 | diff2 | blob | history
tools/perf/builtin-mem.c diff1 | diff2 | blob | history
tools/perf/builtin-record.c diff1 | diff2 | blob | history
tools/perf/builtin-report.c diff1 | diff2 | blob | history
tools/perf/builtin-sched.c diff1 | diff2 | blob | history
tools/perf/builtin-script.c diff1 | diff2 | blob | history
tools/perf/check-headers.sh diff1 | diff2 | blob | history
tools/perf/perf.h diff1 | diff2 | blob | history
tools/perf/pmu-events/jevents.h diff1 | diff2 | blob | history
tools/perf/pmu-events/pmu-events.h diff1 | diff2 | blob | history
tools/perf/tests/attr.c diff1 | diff2 | blob | history
tools/perf/tests/attr.py diff1 | diff2 | blob | history
tools/perf/tests/builtin-test.c diff1 | diff2 | blob | history
tools/perf/tests/mmap-thread-lookup.c diff1 | diff2 | blob | history
tools/perf/tests/topology.c diff1 | diff2 | blob | history
tools/perf/trace/beauty/beauty.h diff1 | diff2 | blob | history
tools/perf/trace/beauty/mmap.c diff1 | diff2 | blob | history
tools/perf/ui/browsers/hists.c diff1 | diff2 | blob | history
tools/perf/ui/progress.c diff1 | diff2 | blob | history
tools/perf/ui/progress.h diff1 | diff2 | blob | history
tools/perf/ui/stdio/hist.c diff1 | diff2 | blob | history
tools/perf/ui/tui/progress.c diff1 | diff2 | blob | history
tools/perf/util/annotate.c diff1 | diff2 | blob | history
tools/perf/util/callchain.c diff1 | diff2 | blob | history
tools/perf/util/callchain.h diff1 | diff2 | blob | history
tools/perf/util/comm.c diff1 | diff2 | blob | history
tools/perf/util/config.c diff1 | diff2 | blob | history
tools/perf/util/data.c diff1 | diff2 | blob | history
tools/perf/util/data.h diff1 | diff2 | blob | history
tools/perf/util/debug.c diff1 | diff2 | blob | history
tools/perf/util/dso.c diff1 | diff2 | blob | history
tools/perf/util/dso.h diff1 | diff2 | blob | history
tools/perf/util/event.c diff1 | diff2 | blob | history
tools/perf/util/event.h diff1 | diff2 | blob | history
tools/perf/util/evlist.h diff1 | diff2 | blob | history
tools/perf/util/evsel.h diff1 | diff2 | blob | history
tools/perf/util/evsel_fprintf.c diff1 | diff2 | blob | history
tools/perf/util/header.c diff1 | diff2 | blob | history
tools/perf/util/hist.c diff1 | diff2 | blob | history
tools/perf/util/jit.h diff1 | diff2 | blob | history
tools/perf/util/jitdump.c diff1 | diff2 | blob | history
tools/perf/util/machine.c diff1 | diff2 | blob | history
tools/perf/util/machine.h diff1 | diff2 | blob | history
tools/perf/util/map.c diff1 | diff2 | blob | history
tools/perf/util/map.h diff1 | diff2 | blob | history
tools/perf/util/parse-events.c diff1 | diff2 | blob | history
tools/perf/util/parse-events.h diff1 | diff2 | blob | history
tools/perf/util/parse-events.l diff1 | diff2 | blob | history
tools/perf/util/pmu.c diff1 | diff2 | blob | history
tools/perf/util/pmu.h diff1 | diff2 | blob | history
tools/perf/util/print_binary.c diff1 | diff2 | blob | history
tools/perf/util/print_binary.h diff1 | diff2 | blob | history
tools/perf/util/rb_resort.h diff1 | diff2 | blob | history
tools/perf/util/session.c diff1 | diff2 | blob | history
tools/perf/util/session.h diff1 | diff2 | blob | history
tools/perf/util/sort.c diff1 | diff2 | blob | history
tools/perf/util/sort.h diff1 | diff2 | blob | history
tools/perf/util/srcline.c diff1 | diff2 | blob | history
tools/perf/util/srcline.h diff1 | diff2 | blob | history
tools/perf/util/stat-shadow.c diff1 | diff2 | blob | history
tools/perf/util/stat.c diff1 | diff2 | blob | history
tools/perf/util/stat.h diff1 | diff2 | blob | history
tools/perf/util/symbol.c diff1 | diff2 | blob | history
tools/perf/util/symbol.h diff1 | diff2 | blob | history
tools/perf/util/thread.c diff1 | diff2 | blob | history
tools/perf/util/thread.h diff1 | diff2 | blob | history
tools/perf/util/top.h diff1 | diff2 | blob | history
tools/perf/util/util.c diff1 | diff2 | blob | history
tools/perf/util/util.h diff1 | diff2 | blob | history
tools/perf/util/vdso.c diff1 | diff2 | blob | history
tools/perf/util/zlib.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.