projects / platform / kernel / linux-rpi3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5706ffd 201e7de)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 05:18:06 +0000 (21:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 05:18:06 +0000 (21:18 -0800)
Pull leftover perf fixes from Ingo Molnar:
 "Two perf fixes left over from the previous cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf session: Do not fail on processing out of order event
  x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs

1  2 
tools/perf/util/event.h patch | diff1 | diff2 | blob | history
tools/perf/util/session.c patch | diff1 | diff2 | blob | history

diff --cc tools/perf/util/event.h
Simple merge
diff --cc tools/perf/util/session.c
Simple merge
Domain: System / Kernel; Licenses: GPL-2.0;