From: Michael Ellerman Date: Thu, 17 Aug 2017 13:14:17 +0000 (+1000) Subject: Merge branch 'topic/ppc-kvm' into next X-Git-Tag: v4.14-rc1~119^2~186 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8434f0892ee85504a230a0e402c569774a8d0c42;p=nvme.git 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. --- 8434f0892ee85504a230a0e402c569774a8d0c42