Em Fri, May 29, 2015 at 04:01:38PM +0200, Martin Liška escreveu:
> On 05/29/2015 03:59 PM, Arnaldo Carvalho de Melo wrote:
> >Em Fri, May 29, 2015 at 03:09:24PM +0200, Martin Liška escreveu:
> >>>I failed to find the problem, ouch, the patches looks the same, applying
> >>>by hand...
> >>That's re
On 05/29/2015 03:59 PM, Arnaldo Carvalho de Melo wrote:
Em Fri, May 29, 2015 at 03:09:24PM +0200, Martin Liška escreveu:
I failed to find the problem, ouch, the patches looks the same, applying
by hand...
That's really strange ;)
Anyway, thanks for application.
I ended up wasting^Winvesting
Em Fri, May 29, 2015 at 03:09:24PM +0200, Martin Liška escreveu:
> >I failed to find the problem, ouch, the patches looks the same, applying
> >by hand...
> That's really strange ;)
> Anyway, thanks for application.
I ended up wasting^Winvesting some more time on that, it seems it was
all thansk
Em Fri, May 29, 2015 at 10:08:06AM -0300, Arnaldo Carvalho de Melo escreveu:
> [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
f: 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:
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
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, rec
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
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
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
Assign input_name, received from program arguments, to
file data structure.
Signed-off-by: Martin Liska
---
tools/perf/builtin-annotate.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index c434e12..4e08c2d 10
11 matches
Mail list logo
