Paolo or Radim,
Please do a pull from the kvm-ppc-next-4.15-2 tag in my tree, because
I have merged in my kvm-ppc-fixes branch and then done a little
tidying up after that. The recent patch "KVM: PPC: Book3S HV: Fix
exclusion between HPT resizing and other HPT updates" on my
kvm-ppc-fixes branch modified code that was very substantially
rearranged in my patch series to implement HPT guests on radix hosts
on POWER9, so the conflict was non-trivial to resolve. There was also
a conflict between two changes to the code for the KVM_CAP_PPC_HTM
capability that I resolved.
Thanks,
Paul.
The following changes since commit c01015091a77035de1939ef106bfbcaf9a21395f:
KVM: PPC: Book3S HV: Run HPT guests on POWER9 radix hosts (2017-11-01 15:36:41 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc tags/kvm-ppc-next-4.15-2
for you to fetch changes up to 432953b4455d8a48af0500a77826c71871671161:
KVM: PPC: Book3S HV: Cosmetic post-merge cleanups (2017-11-09 15:37:10 +1100)
----------------------------------------------------------------
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.
----------------------------------------------------------------
Alexey Kardashevskiy (1):
KVM: PPC: Book3S: Protect kvmppc_gpa_to_ua() with SRCU
Benjamin Herrenschmidt (1):
KVM: PPC: Book3S HV: Add more barriers in XIVE load/unload code
Greg Kurz (1):
KVM: PPC: Fix oops when checking KVM_CAP_PPC_HTM
Nicholas Piggin (1):
KVM: PPC: Book3S HV: POWER9 more doorbell fixes
Paul Mackerras (3):
KVM: PPC: Book3S HV: Fix exclusion between HPT resizing and other HPT updates
Merge branch 'kvm-ppc-fixes' into kvm-ppc-next
KVM: PPC: Book3S HV: Cosmetic post-merge cleanups
arch/powerpc/kvm/book3s_64_mmu_hv.c | 10 ++++++
arch/powerpc/kvm/book3s_64_vio.c | 23 +++++++-----
arch/powerpc/kvm/book3s_hv.c | 64 ++++++++++++++++++++-------------
arch/powerpc/kvm/book3s_hv_rmhandlers.S | 13 +++++--
arch/powerpc/kvm/powerpc.c | 2 +-
5 files changed, 75 insertions(+), 37 deletions(-)
