linux-kernel - Re: [PATCH] perf annotate: fix -i option, which is currently ignored.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150529131635.GP24859@kernel.org>
Date:	Fri, 29 May 2015 10:16:35 -0300
From:	Arnaldo Carvalho de Melo <acme@...nel.org>
To:	Martin Liška <mliska@...e.cz>
Cc:	linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...nel.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Paul Mackerras <paulus@...ba.org>
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/