From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Date: Thu, 09 Apr 2015 08:49:54 +0000 Subject: Re: [PATCH v2 00/12] Remaining improvements for HV KVM Message-Id: <55263D32.1010201@redhat.com> List-Id: References: <1427512872-2610-1-git-send-email-paulus@samba.org> <5525B276.9050706@suse.de> In-Reply-To: <5525B276.9050706@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Alexander Graf , Paul Mackerras , kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, Marcelo Tosatti On 09/04/2015 00:57, Alexander Graf wrote: >> >> The last patch in this series needs a definition of PPC_MSGCLR that is >> added by the patch "powerpc/powernv: Fixes for hypervisor doorbell >> handling", which has now gone upstream into Linus' tree as commit >> 755563bc79c7 via the linuxppc-dev mailing list. Alex, how do you want >> to handle that? You could pull in the master branch of the kvm tree, >> which includes 755563bc79c7, or you could cherry-pick 755563bc79c7 and >> let the subsequent merge fix it up. > > I've just cherry-picked it for now since it still lives in my queue, so > it will get thrown out automatically once I rebase on next if it's > included in there. > > Paolo / Marcelo, could you please try to somehow get the commit above > into the next branch somehow? I guess the easiest would be to merge > linus/master into kvm/next. > > Thanks, applied all to kvm-ppc-queue. I plan to send the x86/MIPS/s390/ARM merge very early to Linus, maybe even tomorrow. So you can just rebase on top of 4.0-rc6 and send your pull request relative to Linus's tree instead of kvm/next. Does that work for you? Paolo