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? -- 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
