On Thu, Mar 7, 2013 at 10:40 AM, Gleb Natapov <gleb@xxxxxxxxxx> wrote: > On Thu, Mar 07, 2013 at 07:57:23AM +0100, Marc Zyngier wrote: >> On Wed, 6 Mar 2013 20:40:00 -0800, Christoffer Dall >> <cdall@xxxxxxxxxxxxxxx> >> wrote: >> > On Wed, Mar 6, 2013 at 7:54 PM, Marc Zyngier <marc.zyngier@xxxxxxx> >> wrote: >> >> On Wed, 6 Mar 2013 16:31:48 -0800, Christoffer Dall >> >> <cdall@xxxxxxxxxxxxxxx> >> >> wrote: >> >> >> >> Hi Christoffer, >> >> >> >>> >> >>> Please pull these KVM/ARM fixes mostly centered around preparation for >> >>> Marc's ARMv8 KVM work. >> >> >> >> Can we please hold on that for a while? asm-offset.c is usually a >> >> candidate for merge conflicts as people start pushing patches post >> merge >> >> window, and it would make sense to see what is happening in that space. >> >> >> > Sure, when would you see this happen exactly? >> >> Usually, by -rc5 we have a pretty good idea of what is going in. Also, >> putting things into -next is a good way to detect potential problems. >> > But how waiting for -rc5 will help us? kvm.git will stay the same. If > conflict will happen during next merge windows Linus will resolve it. > Putting the tree into -next is a good idea. It will provide testing and > will show use what kind of conflicts awaits us during next merge window. > But after the tree include into -next it cannot be rebased. > Neither kvm-arm-fixes nor kvm-arm-next should ever rebase. -Christoffer -- 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
