Re: [PULL 00/12] ppc patch queue 2012-10-30

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 31.10.2012, at 11:26, Avi Kivity <avi@xxxxxxxxxx> wrote:

> On 10/31/2012 12:22 PM, Alexander Graf wrote:
>> 
>> 
>> On 31.10.2012, at 02:32, Marcelo Tosatti <mtosatti@xxxxxxxxxx> 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?

I merely want to know which one I should work against. So far I was under the impression that next is the one.

Alex

> 
> 
> -- 
> error compiling committee.c: too many arguments to function
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux