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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Wed, 12 Apr 2017 09:24:31 +0200
From:   Ingo Molnar <mingo@...nel.org>
To:     Christian Borntraeger <borntraeger@...ibm.com>
Cc:     Arnaldo Carvalho de Melo <acme@...nel.org>,
        linux-kernel@...r.kernel.org,
        Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
        Andi Kleen <ak@...ux.intel.com>,
        Andreas Krebbel <krebbel@...ux.vnet.ibm.com>,
        Andrew Vagin <avagin@...nvz.org>,
        David Ahern <dsahern@...il.com>,
        David Carrillo-Cisneros <davidcc@...gle.com>,
        Don Zickus <dzickus@...hat.com>, He Kuang <hekuang@...wei.com>,
        Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>,
        Jiri Olsa <jolsa@...nel.org>, Kan Liang <kan.liang@...el.com>,
        Martin Schwidefsky <schwidefsky@...ibm.com>,
        Masami Hiramatsu <mhiramat@...nel.org>,
        Namhyung Kim <namhyung@...nel.org>,
        Paul Turner <pjt@...gle.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Simon Que <sque@...omium.org>, stable@...nel.org,
        #@...radead.org, v4.10+@...radead.org,
        Stephane Eranian <eranian@...gle.com>,
        Taeung Song <treeze.taeung@...il.com>,
        Wang Nan <wangnan0@...wei.com>,
        Yao Jin <yao.jin@...ux.intel.com>,
        Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: Re: [GIT PULL 00/18] perf/core improvements and fixes


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