From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753339AbdDLHYi (ORCPT <rfc822;w@1wt.eu>);
        Wed, 12 Apr 2017 03:24:38 -0400
Received: from mail-wm0-f68.google.com ([74.125.82.68]:34785 "EHLO
        mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752515AbdDLHYg (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 12 Apr 2017 03:24:36 -0400
Date: Wed, 12 Apr 2017 09:24:31 +0200
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
Message-ID: <20170412072431.GA17936@gmail.com>
References: <20170412005215.30135-1-acme@kernel.org>
 <20170412053055.GA9923@gmail.com>
 <c84646bd-df94-05a3-c874-9b69a6a5541d@de.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <c84646bd-df94-05a3-c874-9b69a6a5541d@de.ibm.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* 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