2017-11-09 21:50+1100, Paul Mackerras: > 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. Pulled, thanks.
