]> git.baikalelectronics.ru Git - kernel.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)
commitb4aa3b33346f60a50d7d7ebb3c07fc02d4e81336
treea8bc1734a06a1c57bd797220a99514e70ec72f93
parent095b56f61356a47a9798c3b14211cdf87e0967a6
parentc8f2cd96ad7b690e654c93c2eb0594365ca4eec1
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