From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756178AbbE2NQx (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 May 2015 09:16:53 -0400
Received: from mail.kernel.org ([198.145.29.136]:46428 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753920AbbE2NQn (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 May 2015 09:16:43 -0400
Date: Fri, 29 May 2015 10:16:35 -0300
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Martin =?utf-8?B?TGnFoWth?= <mliska@suse.cz>
Cc: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
        Peter Zijlstra <a.p.zijlstra@chello.nl>,
        Paul Mackerras <paulus@samba.org>
Subject: Re: [PATCH] perf annotate: fix -i option, which is currently ignored.
Message-ID: <20150529131635.GP24859@kernel.org>
References: <55685654.2010209@suse.cz>
 <20150529124241.GL24859@kernel.org>
 <20150529124353.GM24859@kernel.org>
 <55685FEB.9090706@suse.cz>
 <20150529130806.GO24859@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150529130806.GO24859@kernel.org>
X-Url: http://acmel.wordpress.com
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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