Merge branch 'topic/ppc-kvm' into next

Bring in the commit to rename find_linux_pte_or_hugepte() which touches
arch and KVM code, and might need to be merged with the kvmppc tree to
avoid conflicts.

diff --cc arch/powerpc/include/asm/pgtable.h
Simple merge

diff --cc arch/powerpc/kvm/book3s_64_mmu_radix.c
Simple merge

diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge