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 S1751600AbdEETif (ORCPT <rfc822;w@1wt.eu>);
        Fri, 5 May 2017 15:38:35 -0400
Received: from mail-it0-f46.google.com ([209.85.214.46]:38513 "EHLO
        mail-it0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751300AbdEETie (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 5 May 2017 15:38:34 -0400
MIME-Version: 1.0
In-Reply-To: <20170505161345.GA23336@e104818-lin.cambridge.arm.com>
References: <20170505161345.GA23336@e104818-lin.cambridge.arm.com>
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 May 2017 12:38:32 -0700
X-Google-Sender-Auth: X93zDgeABa1M7nlgQQHqxZ1uK48
Message-ID: <CA+55aFxFoV_BUbQ=fUAWd2WxGRPe3K_eb7yfZYrh7oa6UOgOCA@mail.gmail.com>
Subject: Re: [GIT PULL] arm64 updates for 4.12
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>,
        "linux-arm-kernel@lists.infradead.org" 
        <linux-arm-kernel@lists.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Fri, May 5, 2017 at 9:13 AM, Catalin Marinas <catalin.marinas@arm.com> wrote:
> diff --cc arch/arm64/include/asm/bug.h

Hmm. The trivial resolution I did gets a different diff as the end
result, but your diff looks different.

I think you used "-U2" to make for a smaller and more targeted context..

So I think the trivial resolution is what you meant. But I couldn't
test it, so I thought I'd mention this oddity.

               Linus