From mboxrd@z Thu Jan  1 00:00:00 1970
From: Radim =?utf-8?B?S3LEjW3DocWZ?= <rkrcmar@redhat.com>
Subject: Re: [GIT PULL] Please pull paulus/powerpc kvm-ppc-next-4.15-2 tag
Date: Thu, 9 Nov 2017 18:59:10 +0100
Message-ID: <20171109175910.GI20859@flask>
References: <20171109105014.GD32509@fergus.ozlabs.ibm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
        kvm-ppc@vger.kernel.org
To: Paul Mackerras <paulus@ozlabs.org>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:39286 "EHLO mx1.redhat.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1752459AbdKIR7N (ORCPT <rfc822;kvm@vger.kernel.org>);
        Thu, 9 Nov 2017 12:59:13 -0500
Content-Disposition: inline
In-Reply-To: <20171109105014.GD32509@fergus.ozlabs.ibm.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.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.