From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
Alexei Starovoitov <ast@plumgrid.com>,
Brendan Gregg <brendan.d.gregg@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
David Ahern <dsahern@gmail.com>, He Kuang <hekuang@huawei.com>,
Jiri Olsa <jolsa@redhat.com>, Kaixu Xia <xiakaixu@huawei.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Matt Fleming <matt@codeblueprint.co.uk>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
pi3orama@163.com, Raphael Beamonte <raphael.beamonte@gmail.com>,
Wang Nan <wangnan0@huawei.com>, Zefan Li <lizefan@huawei.com>
Subject: Re: [GIT PULL 0/8] perf/core improvements and fixes
Date: Wed, 16 Sep 2015 10:50:52 -0300 [thread overview]
Message-ID: <20150916135052.GG11551@kernel.org> (raw)
In-Reply-To: <20150916072336.GA27378@gmail.com>
Em Wed, Sep 16, 2015 at 09:25:44AM +0200, Ingo Molnar escreveu:
>
> * Arnaldo Carvalho de Melo <acme@kernel.org> wrote:
>
> > Hi Ingo,
> >
> > Please consider pulling,
> >
> > - Arnaldo
> >
> > The following changes since commit 9059b284caecb628fac826c2c5cc8ee85708eec1:
> >
> > Merge tag 'perf-core-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2015-09-15 08:50:59 +0200)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo
>
> So your perf/urgent bits now conflict with the latest perf/core, in
> tools/perf/ui/browsers/hists.c. I have merged perf/urgent into perf/core - please
> double check my resolution (d71b0ad8d309).
Looks fine, tested it even, thanks!
- Arnaldo
next prev parent reply other threads:[~2015-09-16 13:50 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-15 15:28 [GIT PULL 0/8] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 1/8] perf probe: Free perf_probe_event in cleanup_perf_probe_events() Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 2/8] perf probe: Export init/exit_probe_symbol_maps() Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 3/8] tools: Add err.h with ERR_PTR PTR_ERR interface Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 4/8] perf tools: Propagate error info for the tracepoint parsing Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 5/8] perf evsel: Propagate error info from tp_format Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 6/8] perf tools: Enhance parsing events tracepoint error output Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 7/8] perf tools: regs_query_register_offset() infrastructure Arnaldo Carvalho de Melo
2015-09-15 15:28 ` [PATCH 8/8] perf tools: Introduce regs_query_register_offset() for x86 Arnaldo Carvalho de Melo
2015-09-16 7:25 ` [GIT PULL 0/8] perf/core improvements and fixes Ingo Molnar
2015-09-16 13:50 ` Arnaldo Carvalho de Melo [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-28 18:49 Arnaldo Carvalho de Melo
2018-03-29 7:23 ` Ingo Molnar
2017-10-03 12:55 Arnaldo Carvalho de Melo
2017-10-03 16:38 ` Ingo Molnar
2016-01-15 21:40 Arnaldo Carvalho de Melo
2016-01-19 7:32 ` Ingo Molnar
2015-10-29 23:05 Arnaldo Carvalho de Melo
2015-10-30 9:10 ` Ingo Molnar
2015-10-22 22:14 Arnaldo Carvalho de Melo
2015-10-23 8:28 ` Ingo Molnar
2015-10-13 19:41 Arnaldo Carvalho de Melo
2015-10-14 13:09 ` Ingo Molnar
2015-06-17 21:22 Arnaldo Carvalho de Melo
2015-06-18 7:40 ` Ingo Molnar
2014-10-01 19:50 Arnaldo Carvalho de Melo
2014-10-03 3:31 ` Ingo Molnar
2014-05-19 12:30 Jiri Olsa
2014-05-20 6:37 ` Ingo Molnar
2012-09-06 19:31 Arnaldo Carvalho de Melo
2012-09-07 5:39 ` Ingo Molnar
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=20150916135052.GG11551@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=ast@plumgrid.com \
--cc=brendan.d.gregg@gmail.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=hekuang@huawei.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=pi3orama@163.com \
--cc=raphael.beamonte@gmail.com \
--cc=wangnan0@huawei.com \
--cc=xiakaixu@huawei.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).