Merge branch 'perf/urgent' into perf/core

So that we can get the perf bench exec stack fixes and then apply the
remaining fix for the files added after what is in perf/urgent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc tools/perf/bench/mem-memcpy-x86-64-asm.S
index a20780b,185a96d..fcd9cf0
--- 1/tools/perf/bench/mem-memcpy-x86-64-asm.S
--- 2/tools/perf/bench/mem-memcpy-x86-64-asm.S
+++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S
@@@ -1,6 -1,8 +1,12 @@@
 -
 +#define memcpy MEMCPY /* don't hide glibc's memcpy() */
 +#define altinstr_replacement text
 +#define globl p2align 4; .globl
 +#define Lmemcpy_c globl memcpy_c; memcpy_c
 +#define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e
  #include "../../../arch/x86/lib/memcpy_64.S"
+ /*
+  * We need to provide note.GNU-stack section, saying that we want
+  * NOT executable stack. Otherwise the final linking will assume that
+  * the ELF stack should not be restricted at all and set it RWX.
+  */
+ .section .note.GNU-stack,"",@progbits

diff --cc tools/perf/util/evsel.c
Simple merge