[GIT PULL] arm64 updates for 4.12

[Linus Torvalds]

On Fri, May 5, 2017 at 9:13 AM, Catalin Marinas <catalin.marinas at 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