Messages in this thread | | | Date | Fri, 18 Sep 2015 11:12:53 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
tools/perf/ui/browsers/hists.c
between commit:
bd315aab8a3a ("perf top: Fix segfault pressing -> with no hist entries")
from Linus' tree and commit:
84734b06b630 ("perf hists browser: Zoom in/out for processor socket")
from the tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc tools/perf/ui/browsers/hists.c index c04c60d4863c,380e9080991e..000000000000 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@@ -1968,9 -2017,10 +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,
| |