From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [kvmarm] [GIT PULL v2] KVM/ARM Fixes for 3.9-rc1 Date: Thu, 7 Mar 2013 20:40:37 +0200 Message-ID: <20130307184037.GE24444@redhat.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Christoffer Dall , Marcelo Tosatti , KVM General , kvmarm@lists.cs.columbia.edu To: Marc Zyngier Return-path: Received: from mx1.redhat.com ([209.132.183.28]:15100 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932152Ab3CGSlC (ORCPT ); Thu, 7 Mar 2013 13:41:02 -0500 Content-Disposition: inline In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Mar 07, 2013 at 07:57:23AM +0100, Marc Zyngier wrote: > On Wed, 6 Mar 2013 20:40:00 -0800, Christoffer Dall > > wrote: > > On Wed, Mar 6, 2013 at 7:54 PM, Marc Zyngier > wrote: > >> On Wed, 6 Mar 2013 16:31:48 -0800, Christoffer Dall > >> > >> 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. -- Gleb.