diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 11:31:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-28 11:31:06 -0700 |
| commit | b92d9648edcc56baf537afe491b228f158b68fcb (patch) | |
| tree | b01783824b67f67ab6c1a6af5ba1ba09167be220 | |
| parent | c38c04c630a5fb626e93b7530671a67feab9596c (diff) | |
| parent | 3fa72fe9c614717d22ae75b84d45f41da65c10fe (diff) | |
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