Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for...

Conflicts:
	arch/x86/kernel/traps.c

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

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/kernel/traps.c
index 461926b,f73b5d4..c6eb418
--- 1/arch/x86/kernel/traps.c
--- 2/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -379,7 -357,7 +379,7 @@@ NOKPROBE_SYMBOL(do_int3)
   * for scheduling or signal handling. The actual stack switch is done in
   * entry.S
   */
- asmlinkage struct pt_regs *sync_regs(struct pt_regs *eregs)
 -asmlinkage __visible __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
++asmlinkage __visible struct pt_regs *sync_regs(struct pt_regs *eregs)
  {
        struct pt_regs *regs = eregs;
        /* Did already sync */

diff --cc include/linux/perf_event.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc tools/lib/lockdep/Makefile
Simple merge