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 S934939AbdACLSj (ORCPT <rfc822;w@1wt.eu>);
        Tue, 3 Jan 2017 06:18:39 -0500
Received: from hqemgate14.nvidia.com ([216.228.121.143]:5684 "EHLO
        hqemgate14.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932457AbdACLSb (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 3 Jan 2017 06:18:31 -0500
X-PGP-Universal: processed;
        by hqnvupgp07.nvidia.com on Mon, 02 Jan 2017 15:14:52 -0800
Subject: Re: [PATCH 1/2] arm64: setup: introduce kaslr_offset()
To: <alex.popov@linux.com>, Yury Norov <ynorov@caviumnetworks.com>,
        "Catalin Marinas" <catalin.marinas@arm.com>,
        Will Deacon <will.deacon@arm.com>
References: <1481417456-28826-1-git-send-email-alex.popov@linux.com>
 <1481417456-28826-2-git-send-email-alex.popov@linux.com>
 <20161222061857.GA26502@yury-N73SV>
 <4094c1ef-0a75-7076-58e0-52ece326188b@linux.com>
CC: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
        Mark Rutland <mark.rutland@arm.com>, Rob Herring <robh@kernel.org>,
        Kefeng Wang <wangkefeng.wang@huawei.com>,
        AKASHI Takahiro <takahiro.akashi@linaro.org>,
        Jon Masters <jcm@redhat.com>, David Daney <david.daney@cavium.com>,
        Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Dmitry Vyukov <dvyukov@google.com>,
        "Nicolai Stange" <nicstange@gmail.com>,
        James Morse <james.morse@arm.com>,
        "Andrey Ryabinin" <aryabinin@virtuozzo.com>,
        Andrey Konovalov <andreyknvl@google.com>,
        <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
        syzkaller <syzkaller@googlegroups.com>
From: Jon Hunter <jonathanh@nvidia.com>
Message-ID: <db9266fb-5c6e-5dfb-2aac-4165c6b2b337@nvidia.com>
Date: Tue, 3 Jan 2017 11:18:15 +0000
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.5.1
MIME-Version: 1.0
In-Reply-To: <4094c1ef-0a75-7076-58e0-52ece326188b@linux.com>
X-Originating-IP: [10.21.132.143]
X-ClientProxiedBy: DRUKMAIL101.nvidia.com (10.25.59.19) To
 UKMAIL101.nvidia.com (10.26.138.13)
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Will, Catalin,

On 22/12/16 12:51, Alexander Popov wrote:
> On 22.12.2016 09:18, Yury Norov wrote:
>> On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote:
>>> Introduce kaslr_offset() similarly to x86_64 for fixing kcov.
> 
> [...]
> 
>> Hi Alexander,
>>
>> I found today's linux-next master broken:
> 
> [...]
> 
>> It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f
>> (arm64: setup: introduce kaslr_offset()). 
> 
> Hello Yury,
> 
> There was a race during applying this patch. So currently linux-next has 2 versions of it.
> 
> The first one is 1a339a14b1f2c7a0dfdd6db79eee1e55d3cec357, which is original.
> The second one is 7ede8665f27cde7da69e8b2fbeaa1ed0664879c5, updated by Will Deacon and
> applied to the mainline.
> 
> I'm sorry for that. The first one should be definitely dropped.

Looks like this is still broken in today's -next.

Cheers
Jon

-- 
nvpublic