Merge branch 'perf-core-for-mingo' into perf/urgent

Conflicts:
	tools/perf/bench/numa.c

Pull perf fixes from Jiri Olsa.

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

diff --cc MAINTAINERS
Simple merge

diff --cc tools/perf/bench/numa.c
index 97d86d828190950af7f133c1b8be72550070d3d1,20697fbf2c98b1c095d2449ba47fda672a1313b0..ebfa163b80b568af4d2708b1ff3b1980ea16e2b6
--- 1/tools/perf/bench/numa.c
--- 2/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@@ -1593,7 -1593,10 +1593,11 @@@ static void init_params(struct params *
        p->data_rand_walk               = true;
        p->nr_loops                     = -1;
        p->init_random                  = true;
+       p->mb_global_str                = "1";
+       p->nr_proc                      = 1;
+       p->nr_threads                   = 1;
+       p->nr_secs                      = 5;
 +      p->run_all                      = argc == 1;
  }
  
  static int run_bench_numa(const char *name, const char **argv)