From: Ingo Molnar <mingo@kernel.org>
To: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
linux-kernel@vger.kernel.org,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>,
Andreas Krebbel <krebbel@linux.vnet.ibm.com>,
Andrew Vagin <avagin@openvz.org>, David Ahern <dsahern@gmail.com>,
David Carrillo-Cisneros <davidcc@google.com>,
Don Zickus <dzickus@redhat.com>, He Kuang <hekuang@huawei.com>,
Hendrik Brueckner <brueckner@linux.vnet.ibm.com>,
Jiri Olsa <jolsa@kernel.org>, Kan Liang <kan.liang@intel.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Namhyung Kim <namhyung@kernel.org>, Paul Turner <pjt@google.com>,
Peter Zijlstra <peterz@infradead.org>,
Simon Que <sque@chromium.org>,
stable@kernel.org, #@infradead.org, v4.10+@infradead.org,
Stephane Eranian <eranian@google.com>,
Taeung Song <treeze.taeung@gmail.com>,
Wang Nan <wangnan0@huawei.com>, Yao Jin <yao.jin@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: Re: [GIT PULL 00/18] perf/core improvements and fixes
Date: Wed, 12 Apr 2017 09:24:31 +0200 [thread overview]
Message-ID: <20170412072431.GA17936@gmail.com> (raw)
In-Reply-To: <c84646bd-df94-05a3-c874-9b69a6a5541d@de.ibm.com>
* Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> The merge looks wrong:
>
> dbdebdc53 (Ravi Bangoria 2016-11-23 21:33:46 +0530 133) },
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 134) {
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 135) .name = "s390",
> d9f8dfa9b (Christian Borntraeger 2017-04-06 09:51:52 +0200 136) .init = s390__annotate_init,
> e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 137) .objdump = {
> e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 138) .comment_char = '#',
> e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 139) },
> e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 140) },
> 43d5b075c (Ingo Molnar 2017-04-12 07:29:13 +0200 141) {
> 43d5b075c (Ingo Molnar 2017-04-12 07:29:13 +0200 142) .name = "s390",
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 143) .objdump = {
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 144) .comment_char = '#',
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 145) },
> 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 146) },
> 786c1b518 (Arnaldo Carvalho de Melo 2016-11-16 15:39:50 -0300 147) };
>
> You can delete line 141-146
Ok, I've deleted those lines and amended the merge commit - thanks!
Ingo
next prev parent reply other threads:[~2017-04-12 7:24 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-12 0:51 [GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo
2017-04-12 0:51 ` [PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options Arnaldo Carvalho de Melo
2017-04-12 0:51 ` [PATCH 02/18] perf script: Use strtok_r() when parsing output field list Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 03/18] perf evsel: Return exact sub event which failed with EPERM for wildcards Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 04/18] perf stat: Refactor the code to strip csv output with ltrim() Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 05/18] perf ui browser: Refactor the code to parse color configs " Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 06/18] perf pmu: Refactor wordwrap() " Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 07/18] perf tools: Refactor the code to strip command name with {l,r}trim() Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 08/18] perf string: Simplify ltrim() implementation Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 09/18] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 10/18] perf annotate s390: Implement jump types for perf annotate Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 11/18] perf inject: Don't proceed if perf_session__process_event() fails Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 12/18] perf inject: Copy events when reordering events in pipe mode Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 13/18] perf tools: Describe pipe mode in perf.data-file-fomat.txt Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 14/18] perf annotate: Process attr and build_id records Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 15/18] perf session: Don't rely on evlist in pipe mode Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 16/18] perf tools: Do not print missing features in pipe-mode Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 17/18] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Arnaldo Carvalho de Melo
2017-04-12 0:52 ` [PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line Arnaldo Carvalho de Melo
2017-04-12 5:30 ` [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar
2017-04-12 7:13 ` Christian Borntraeger
2017-04-12 7:24 ` Ingo Molnar [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-05-19 10:54 Arnaldo Carvalho de Melo
2018-05-19 11:33 ` Ingo Molnar
2017-08-29 19:42 Arnaldo Carvalho de Melo
2017-08-29 21:15 ` Ingo Molnar
2017-02-20 19:08 Arnaldo Carvalho de Melo
2017-02-21 8:08 ` Ingo Molnar
2016-11-23 16:40 Arnaldo Carvalho de Melo
2016-11-24 4:10 ` Ingo Molnar
2016-06-27 21:01 Arnaldo Carvalho de Melo
2016-06-28 7:02 ` Ingo Molnar
2016-06-28 8:27 ` Jiri Olsa
2016-06-28 14:01 ` Arnaldo Carvalho de Melo
2016-06-28 14:12 ` Arnaldo Carvalho de Melo
2016-06-29 9:36 ` Ingo Molnar
2015-07-24 1:58 Arnaldo Carvalho de Melo
2015-07-27 15:58 ` Ingo Molnar
2015-05-18 15:50 Arnaldo Carvalho de Melo
2015-05-20 11:25 ` Ingo Molnar
2014-12-16 16:57 Arnaldo Carvalho de Melo
2014-12-17 14:50 ` Arnaldo Carvalho de Melo
2014-12-18 6:24 ` Ingo Molnar
2014-12-11 21:25 Arnaldo Carvalho de Melo
2014-12-12 8:10 ` Ingo Molnar
2014-11-06 21:04 Arnaldo Carvalho de Melo
2014-11-07 5:24 ` Ingo Molnar
2014-08-15 16:49 Arnaldo Carvalho de Melo
2014-08-18 8:18 ` Ingo Molnar
2014-08-15 16:48 Arnaldo Carvalho de Melo
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=20170412072431.GA17936@gmail.com \
--to=mingo@kernel.org \
--cc=#@infradead.org \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=avagin@openvz.org \
--cc=borntraeger@de.ibm.com \
--cc=brueckner@linux.vnet.ibm.com \
--cc=davidcc@google.com \
--cc=dsahern@gmail.com \
--cc=dzickus@redhat.com \
--cc=eranian@google.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=krebbel@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=schwidefsky@de.ibm.com \
--cc=sque@chromium.org \
--cc=stable@kernel.org \
--cc=treeze.taeung@gmail.com \
--cc=v4.10+@infradead.org \
--cc=wangnan0@huawei.com \
--cc=yao.jin@linux.intel.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).