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 S1756157AbbE2Mrs (ORCPT <rfc822;w@1wt.eu>);
	Fri, 29 May 2015 08:47:48 -0400
Received: from cantor2.suse.de ([195.135.220.15]:55991 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1755911AbbE2Mrl (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Fri, 29 May 2015 08:47:41 -0400
Message-ID: <55685FEB.9090706@suse.cz>
Date: Fri, 29 May 2015 14:47:39 +0200
From: =?UTF-8?B?TWFydGluIExpxaFrYQ==?= <mliska@suse.cz>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: Arnaldo Carvalho de Melo <acme@kernel.org>
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.
References: <55685654.2010209@suse.cz> <20150529124241.GL24859@kernel.org> <20150529124353.GM24859@kernel.org>
In-Reply-To: <20150529124353.GM24859@kernel.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Thanks,
Martin