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.2010...@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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/