Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1621873
| From | Ingo Molnar <mingo@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL 00/18] perf/core improvements and fixes |
| Date | 2017-04-12 09:30 +0200 |
| Message-ID | <tvkSZ-1CE-7@gated-at.bofh.it> (permalink) |
| References | <tveNA-5Wv-1@gated-at.bofh.it> <tvjay-y7-7@gated-at.bofh.it> <tvkJj-1zn-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
* 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
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
[GIT PULL 00/18] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 09/18] perf annotate s390: Fix perf annotate error -95 (4.10 regression) Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 03/18] perf evsel: Return exact sub event which failed with EPERM for wildcards Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 14/18] perf annotate: Process attr and build_id records Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 16/18] perf tools: Do not print missing features in pipe-mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 07/18] perf tools: Refactor the code to strip command name with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 12/18] perf inject: Copy events when reordering events in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 08/18] perf string: Simplify ltrim() implementation Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 01/18] perf callchains: Switch from strtok() to strtok_r() when parsing options Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 17/18] perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 10/18] perf annotate s390: Implement jump types for perf annotate Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 06/18] perf pmu: Refactor wordwrap() with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 13/18] perf tools: Describe pipe mode in perf.data-file-fomat.txt Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 15/18] perf session: Don't rely on evlist in pipe mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 18/18] perf annotate: Use stripped line instead of raw disassemble line Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 05/18] perf ui browser: Refactor the code to parse color configs with ltrim() Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
[PATCH 02/18] perf script: Use strtok_r() when parsing output field list Arnaldo Carvalho de Melo <acme@kernel.org> - 2017-04-12 03:00 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 07:40 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Christian Borntraeger <borntraeger@de.ibm.com> - 2017-04-12 09:20 +0200
Re: [GIT PULL 00/18] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2017-04-12 09:30 +0200
csiph-web