]> asedeno.scripts.mit.edu Git - linux.git/commit
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)
commit8434f0892ee85504a230a0e402c569774a8d0c42
treea8bc1734a06a1c57bd797220a99514e70ec72f93
parent6acdc9a6bad9f23771d24baca763141a24ead6cb
parent94171b19c3f1f4d9d4c0e3aaa1aa161def1ec7ea
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.
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