From: Radim Krčmář <rkrcmar@redhat.com>
Date: Thu, 9 Nov 2017 15:25:22 +0000 (+0100)
Subject: Merge tag 'kvm-ppc-next-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.15-rc1~79^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=61d750773df388632b11a6170098e2865977e1f6;p=users%2Fhch%2Fmisc.git

Merge tag 'kvm-ppc-next-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

Second PPC KVM update for 4.15

This merges in my kvm-ppc-fixes branch to resolve the conflicts
between the fixes that have been applied there and the changes
made in my patch series to allow HPT guests to run on a radix
host on POWER9.  It also resolves another conflict in the code
for the KVM_CAP_PPC_HTM capability.
---

61d750773df388632b11a6170098e2865977e1f6