From mboxrd@z Thu Jan 1 00:00:00 1970 From: Radim =?utf-8?B?S3LEjW3DocWZ?= Date: Thu, 09 Nov 2017 17:59:10 +0000 Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag Message-Id: <20171109175910.GI20859@flask> List-Id: References: <20171109105014.GD32509@fergus.ozlabs.ibm.com> In-Reply-To: <20171109105014.GD32509@fergus.ozlabs.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Paul Mackerras Cc: kvm@vger.kernel.org, Paolo Bonzini , kvm-ppc@vger.kernel.org 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.