]> 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)
commit61f839c2b695d0e9fba420a0a81f1510ab5e3bd1
treea8bc1734a06a1c57bd797220a99514e70ec72f93
parentc00740a0d535a8c349157509e870c318bc9711a7
parent33563c386fdc23bff0a16151ec90042552bb5434
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