From mboxrd@z Thu Jan  1 00:00:00 1970
From: Greg Kurz <gkurz@linux.vnet.ibm.com>
Subject: Re: Preparing kvm/next for first pull request of 3.15 merge window
Date: Wed, 26 Mar 2014 11:32:26 +0100
Message-ID: <20140326113226.6532e0ff@bahia.local>
References: <5331BD09.6090806@redhat.com>
	<20140326035142.GB30363@iris.ozlabs.ibm.com>
	<53329BB8.2040202@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: Paul Mackerras <paulus@samba.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	kvm-ppc <kvm-ppc@vger.kernel.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Christoffer Dall <christoffer.dall@linaro.org>,
	Alexander Graf <agraf@suse.de>,
	Scott Wood <scottwood@freescale.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Return-path: <kvm-ppc-owner@vger.kernel.org>
In-Reply-To: <53329BB8.2040202@redhat.com>
Sender: kvm-ppc-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Wed, 26 Mar 2014 10:19:52 +0100
Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 26/03/2014 04:51, Paul Mackerras ha scritto:
> >> > I would like to know from ARM and PPC maintainers *now* (before the
> >> > merge window opens) what will be in 3.15.  Also, PPC guys, please
> >> > make sure the pull requests will be based on commit e724f080f5dd
> >> > (KVM: PPC: Book3S HV: Fix register usage when loading/saving VRSAVE,
> >> > 2014-03-13).
> > Alex has 5 commits in his kvm-ppc-queue branch that should go in.
> > That tree is based on your kvm-3.14-2 tag, not on e724f080f5dd.
> > Would you accept a pull request for that from me on Alex's behalf
> > since he's away?
> 
> Yes, of course.
> 
> > Do you need me to rebase it at all?
> 
> These are:
> 
> 1ac4484979 PPC: KVM: Introduce hypervisor call H_GET_TCE
> e0a7be38c9 PPC: KVM: fix RESUME_GUEST check before returning from 
> kvmppc_run_core()
> 013e98e657 PPC: KVM: fix RESUME_GUEST check before ending CEDE in 
> kvmppc_run_core()
> e8a7f11fe0 PPC: KVM: fix VCPU run for HV KVM (v2)
> 26d96ec97c PPC: KVM: introduce helper to check RESUME_GUEST and related
> 
> I would consider rebasing; but you know better than me the effect of the 
> two host-crash-fixing patches and how the testability/bisectability of 
> kvm-ppc-queue is affected.
> 
> In particular, how likely is it that reverse-bisection ("which commit 
> fixed the bug?") would end up on e724f080f5dd rather than one of the 
> four RESUME_GUEST commits?
> 

Paul,

It is safe to merge e0a7be38c9, 013e98e657, e8a7f11fe0 and 26d96ec97c as
a single patch... thing I should I've done from the beginning I guess. :)

Cheers.

--
Greg

> > There is also the set of 8 patches that I just posted and Scott
> > acked.  I can make a branch based on e724f080f5dd and send you a pull
> > request.
> 
> Yes, thanks!
> 
> Paolo
> 
> > Let me know what you would prefer regarding Alex's kvm-ppc-queue
> > branch.
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 



-- 
Gregory Kurz                                     kurzgreg@fr.ibm.com
                                                 gkurz@linux.vnet.ibm.com
Software Engineer @ IBM/Meiosys                  http://www.ibm.com
Tel +33 (0)562 165 496

"Anarchy is about taking complete responsibility for yourself."
        Alan Moore.