From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756013AbbE2NJd (ORCPT ); Fri, 29 May 2015 09:09:33 -0400 Received: from cantor2.suse.de ([195.135.220.15]:57261 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753782AbbE2NJ0 (ORCPT ); Fri, 29 May 2015 09:09:26 -0400 Message-ID: <55686504.70402@suse.cz> Date: Fri, 29 May 2015 15:09:24 +0200 From: =?UTF-8?B?TWFydGluIExpxaFrYQ==?= 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 CC: linux-kernel@vger.kernel.org, Ingo Molnar , Peter Zijlstra , Paul Mackerras 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> <55685FEB.9090706@suse.cz> <20150529130806.GO24859@kernel.org> In-Reply-To: <20150529130806.GO24859@kernel.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/29/2015 03:08 PM, Arnaldo Carvalho de Melo wrote: > 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: >>>> 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 :-( > >> 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 > > [acme@zoo linux]$ git remote update tip > Fetching tip > [acme@zoo linux]$ git pull tip perf/core > From git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip > * branch perf/core -> FETCH_HEAD > Already up-to-date. > [acme@zoo linux]$ git log --oneline | head -n2 > f1942b96b4b4 Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core > 09a216ea5c52 perf: Remove myself from MAINTAINERS entry > [acme@zoo linux]$ grep '^\(Subject\|Message-ID\)' /wb/1.patch > Message-ID: <55685654.2010209@suse.cz> > Subject: [PATCH] perf annotate: fix -i option, which is currently ignored. > [acme@zoo linux]$ > > [acme@zoo linux]$ git am /wb/1.patch > Applying: perf annotate: fix -i option, which is currently ignored. > error: patch failed: tools/perf/builtin-annotate.c:289 > error: tools/perf/builtin-annotate.c: patch does not apply > Patch failed at 0001 perf annotate: fix -i option, which is currently > ignored. > The copy of the patch that failed is found in: > /home/acme/git/linux/.git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > [acme@zoo linux]$ > [acme@zoo linux]$ git reset --hard > HEAD is now at f1942b96b4b4 Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core > [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... > > - Arnaldo > That's really strange ;) Anyway, thanks for application. Martin