linux-perf-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael Petlan <mpetlan@redhat.com>
To: Jiri Olsa <jolsa@redhat.com>
Cc: "Arnaldo Carvalho de Melo" <acme@redhat.com>,
	"平松雅巳 / HIRAMATU,MASAMI" <masami.hiramatsu.pt@hitachi.com>,
	"linux-perf-users@vger.kernel.org"
	<linux-perf-users@vger.kernel.org>
Subject: Re: [PATCH 1/2] perf test: Adding an entry for the perftool-testsuite
Date: Mon, 07 Dec 2015 12:45:55 +0100	[thread overview]
Message-ID: <1449488755.24573.190.camel@redhat.com> (raw)
In-Reply-To: <20151206155317.GB11852@krava.brq.redhat.com>

On Sun, 2015-12-06 at 16:53 +0100, Jiri Olsa wrote:
> I can't get this applied on latest acme's perf/core
> 


Hi, I send patches that apply to latest Linus' tree:

https://github.com/torvalds/linux.git

Should I use some different tree? Arnaldo's? What is the URL
of the proper tree I should send patches against?

Thanks.
Michael

> [jolsa@krava perf]$ git am /tmp/w/
> Applying: perf test: Adding an entry for the perftool-testsuite
> error: patch failed: tools/perf/tests/Build:34
> error: tools/perf/tests/Build: patch does not apply
> error: patch failed: tools/perf/tests/builtin-test.c:170
> error: tools/perf/tests/builtin-test.c: patch does not apply
> error: patch failed: tools/perf/tests/tests.h:68
> error: tools/perf/tests/tests.h: patch does not apply
> Patch failed at 0001 perf test: Adding an entry for the perftool-testsuite
> The copy of the patch that failed is found in:
>    /home/jolsa/kernel/linux-perf/.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".
> 
> 
> jirka
> --
> To unsubscribe from this list: send the line "unsubscribe linux-perf-users" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

  reply	other threads:[~2015-12-07 11:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 17:11 [PATCH 1/2] perf test: Adding an entry for the perftool-testsuite Michael Petlan
2015-12-06 15:53 ` Jiri Olsa
2015-12-07 11:45   ` Michael Petlan [this message]
2015-12-07 12:58     ` Jiri Olsa

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=1449488755.24573.190.camel@redhat.com \
    --to=mpetlan@redhat.com \
    --cc=acme@redhat.com \
    --cc=jolsa@redhat.com \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).