Re: [GIT PULL 00/18] perf/core improvements and fixes

[Ingo Molnar]

* Christian Borntraeger <borntraeger@xxxxxxxxxx> 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