Messages in this thread Patch in this message | | | Date | Fri, 29 May 2015 10:16:35 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf annotate: fix -i option, which is currently ignored. |
| |
Em Fri, May 29, 2015 at 10:08:06AM -0300, Arnaldo Carvalho de Melo escreveu: > [acme@zoo linux]$ patch -p1 < /wb/1.patch > patching file tools/perf/builtin-annotate.c > Hunk #1 FAILED at 289. > Hunk #2 FAILED at 346. > 2 out of 2 hunks FAILED -- saving rejects to file > tools/perf/builtin-annotate.c.rej > [acme@zoo linux]$
> I failed to find the problem, ouch, the patches looks the same, applying > by hand...
Somehow your patch came with extra leading spaces, saw using 'set list' on vim:
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c$ index c434e12..4e08c2d 100644$ --- a/tools/perf/builtin-annotate.c$ +++ b/tools/perf/builtin-annotate.c$ @@ -289,7 +289,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)$ ^I^I},$ ^I};$ ^Istruct perf_data_file file = {$ -^I^I.path = input_name,$ ^I^I.mode = PERF_DATA_MODE_READ,$ ^I};$ ^Iconst struct option options[] = {$ @@ -346,6 +345,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused)$ ^Ielse if (annotate.use_gtk)$ ^I^Iuse_browser = 2;$ $ +^Ifile.path = input_name;$ +$ ^Isetup_browser(true);$ $ ^Iannotate.session = perf_session__new(&file, false, &annotate.tool);$ -- $ 2.1.4$ and then, if I remove those, it applies, please check your thunderbird environment:
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
- Arnaldo
| |