From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 28 Oct 2016 18:31:06 +0000 (-0700)
Subject: Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
X-Git-Tag: v5.15~12561
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b92d9648edcc56baf537afe491b228f158b68fcb;p=mirror_ubuntu-kernels.git

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 fixes from Will Deacon:
 "Three arm64 fixes for -rc3.  They're all pretty straightforward: a
  couple of NUMA issues from the Huawei folks and a thinko in
  __page_to_voff that seems to be benign, but is certainly better off
  fixed.

  Summary:
   - couple of NUMA fixes
   - thinko in __page_to_voff"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: mm: fix __page_to_voff definition
  arm64/numa: fix incorrect log for memory-less node
  arm64/numa: fix pcpu_cpu_distance() to get correct CPU proximity
---

b92d9648edcc56baf537afe491b228f158b68fcb