[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Fri, 5 May 2017 12:38:32 -0700
From: Linus Torvalds <torvalds@...ux-foundation.org>
To: Catalin Marinas <catalin.marinas@....com>
Cc: Will Deacon <will.deacon@....com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] arm64 updates for 4.12
On Fri, May 5, 2017 at 9:13 AM, Catalin Marinas <catalin.marinas@....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
Powered by blists - more mailing lists