All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: "Martin Liška" <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.
Date: Fri, 29 May 2015 09:51:59 -0300	[thread overview]
Message-ID: <20150529125159.GN24859@kernel.org> (raw)
In-Reply-To: <55685FEB.9090706@suse.cz>

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...

  reply	other threads:[~2015-05-29 12:52 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-29 12:06 [PATCH] perf annotate: fix -i option, which is currently ignored Martin Liška
2015-05-29 12:42 ` Arnaldo Carvalho de Melo
2015-05-29 12:43   ` Arnaldo Carvalho de Melo
2015-05-29 12:47     ` Martin Liška
2015-05-29 12:51       ` Arnaldo Carvalho de Melo [this message]
2015-05-29 13:08       ` Arnaldo Carvalho de Melo
2015-05-29 13:09         ` Martin Liška
2015-05-29 13:59           ` Arnaldo Carvalho de Melo
2015-05-29 14:01             ` Martin Liška
2015-05-29 14:17               ` Arnaldo Carvalho de Melo
2015-05-29 13:16         ` Arnaldo Carvalho de Melo
2015-05-29 18:35 ` [tip:perf/core] perf annotate: Fix " tip-bot for Martin Liška

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150529125159.GN24859@kernel.org \
    --to=acme@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=mliska@suse.cz \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.