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 S1755986AbbE2MwG (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 May 2015 08:52:06 -0400
Received: from mail.kernel.org ([198.145.29.136]:44849 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754600AbbE2MwD (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 May 2015 08:52:03 -0400
Date: Fri, 29 May 2015 09:51:59 -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: <20150529125159.GN24859@kernel.org>
References: <55685654.2010209@suse.cz>
 <20150529124241.GL24859@kernel.org>
 <20150529124353.GM24859@kernel.org>
 <55685FEB.9090706@suse.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <55685FEB.9090706@suse.cz>
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 02:47:39PM +0200, Martin Liška escreveu:
> On 05/29/2015 02:43 PM, Arnaldo Carvalho de Melo wrote:
> >Em Fri, May 29, 2015 at 09:42:41AM -0300, Arnaldo Carvalho de Melo escreveu:
> >>Em Fri, May 29, 2015 at 02:06:44PM +0200, Martin Liška escreveu:
> >>>Assign input_name, received from program arguments, to
> >>>file data structure.
> >>
> >>Doesn't apply:
> >>
> >>pat[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]$
> >>
> >>What branch is this intended for? I.e. where have you cloned this from?
> >>
> >>Yeah, I reproduced the problem and will try to figure this out, but
> >>please always be explicit where to apply this.
> >
> >I tried first on perf/core, then on perf/urgent, and it didn't apply in
> >both cases :-(
> >
> >- Arnaldo
> >
> 
> Hello.
> 
> I've just pulled perf, patch is a diff against perf/perf/core.
> 
> $ git log --oneline | head -n2
> 95b12b3 perf annotate: fix -i option, which is currently ignored.
> f1942b9 Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Rechecking...