Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Thu, 17 Aug 2017 13:14:17 +0000 (23:14 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 17 Aug 2017 13:14:17 +0000 (23:14 +1000)
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.

1  2 
arch/powerpc/include/asm/pgtable.h
arch/powerpc/kvm/book3s_64_mmu_radix.c
arch/powerpc/mm/hash_utils_64.c
arch/powerpc/mm/hugetlbpage.c

Simple merge
Simple merge
Simple merge