From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcelo Tosatti <mtosatti@redhat.com>
Subject: Re: [PULL 00/12] ppc patch queue 2012-10-30
Date: Wed, 31 Oct 2012 09:25:47 -0200
Message-ID: <20121031112547.GA32510@amt.cnet>
References: <1351591345-23071-1-git-send-email-agraf@suse.de>
 <20121031013255.GC21986@amt.cnet>
 <BF370EC4-EBF9-4C03-A10F-5DF784C064B6@suse.de>
 <5090FCBC.9090407@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: Alexander Graf <agraf@suse.de>, KVM list <kvm@vger.kernel.org>,
	kvm-ppc <kvm-ppc@vger.kernel.org>
To: Avi Kivity <avi@redhat.com>
Return-path: <kvm-ppc-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <5090FCBC.9090407@redhat.com>
Sender: kvm-ppc-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Wed, Oct 31, 2012 at 12:26:04PM +0200, Avi Kivity wrote:
> On 10/31/2012 12:22 PM, Alexander Graf wrote:
> > 
> > 
> > On 31.10.2012, at 02:32, Marcelo Tosatti <mtosatti@redhat.com> wrote:
> > 
> >> On Tue, Oct 30, 2012 at 11:02:13AM +0100, Alexander Graf wrote:
> >>> Hi Avi / Marcelo,
> >>> 
> >>> This is my current patch queue for ppc.  Please pull.
> >>> 
> >>> Headline changes are:
> >>> 
> >>>  * Fix 440 target
> >>>  * Fix uapi conflict
> >> 
> >> Can you regenerate against queue branch? (btw i forgot to update fsl_hcalls.h...).
> > 
> > Hrm. So which branch am I supposed to base against? Master, next or queue? This one is against next...
> 
> next and queue should be compatible (queue = next + a few patches).  Are
> there any conflicts when merging against queue?

There will be, and fsl_hcalls.h needs fixup (better Alexander verify 
i did not screw up anything else).