From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756110AbbE2MoE (ORCPT ); Fri, 29 May 2015 08:44:04 -0400 Received: from mail.kernel.org ([198.145.29.136]:44358 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754566AbbE2Mn5 (ORCPT ); Fri, 29 May 2015 08:43:57 -0400 Date: Fri, 29 May 2015 09:43:53 -0300 From: Arnaldo Carvalho de Melo To: Martin =?utf-8?B?TGnFoWth?= Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Paul Mackerras Subject: Re: [PATCH] perf annotate: fix -i option, which is currently ignored. Message-ID: <20150529124353.GM24859@kernel.org> References: <55685654.2010209@suse.cz> <20150529124241.GL24859@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150529124241.GL24859@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: X-Mailing-List: linux-kernel@vger.kernel.org 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