Merge branch 'perf/urgent' into perf/core, to resolve a conflict

Conflicts:
	tools/perf/ui/browsers/hists.c

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

diff --cc tools/perf/ui/browsers/hists.c
index 380e908,c04c60d..e1f28f4
--- 1/tools/perf/ui/browsers/hists.c
--- 2/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@@ -2017,10 -1968,9 +2017,11 @@@ skip_annotation
                                          &options[nr_options], dso);
                nr_options += add_map_opt(browser, &actions[nr_options],
                                          &options[nr_options],
-                                         browser->selection->map);
+                                         browser->selection ?
+                                               browser->selection->map : NULL);
 -
 +              nr_options += add_socket_opt(browser, &actions[nr_options],
 +                                           &options[nr_options],
 +                                           socked_id);
                /* perf script support */
                if (browser->he_selection) {
                        nr_options += add_script_opt(browser,

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

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

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

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

diff --cc tools/perf/util/parse-events.c
Simple merge