From: Gleb Natapov <gleb@redhat.com>
To: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <cdall@cs.columbia.edu>,
Marcelo Tosatti <mtosatti@redhat.com>,
KVM General <kvm@vger.kernel.org>,
kvmarm@lists.cs.columbia.edu
Subject: Re: [kvmarm] [GIT PULL v2] KVM/ARM Fixes for 3.9-rc1
Date: Thu, 7 Mar 2013 20:40:37 +0200 [thread overview]
Message-ID: <20130307184037.GE24444@redhat.com> (raw)
In-Reply-To: <fd46d1c4746530d6c705dba843c848ea@localhost>
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@cs.columbia.edu>
> wrote:
> > On Wed, Mar 6, 2013 at 7:54 PM, Marc Zyngier <marc.zyngier@arm.com>
> wrote:
> >> On Wed, 6 Mar 2013 16:31:48 -0800, Christoffer Dall
> >> <cdall@cs.columbia.edu>
> >> 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.
next prev parent reply other threads:[~2013-03-07 18:41 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-07 0:31 [GIT PULL v2] KVM/ARM Fixes for 3.9-rc1 Christoffer Dall
2013-03-07 3:54 ` [kvmarm] " Marc Zyngier
2013-03-07 4:40 ` Christoffer Dall
2013-03-07 6:57 ` Marc Zyngier
2013-03-07 18:40 ` Gleb Natapov [this message]
2013-03-07 18:49 ` Christoffer Dall
2013-03-07 19:09 ` Marcelo Tosatti
2013-03-07 19:25 ` Christoffer Dall
2013-03-07 19:25 ` Christoffer Dall
2013-03-08 3:12 ` Marc Zyngier
2013-03-08 3:12 ` Marc Zyngier
2013-03-08 11:31 ` Gleb Natapov
2013-03-08 11:31 ` Gleb Natapov
2013-03-11 10:21 ` Marc Zyngier
2013-03-11 10:21 ` Marc Zyngier
2013-03-08 19:26 ` Christoffer Dall
2013-03-08 19:26 ` Christoffer Dall
2013-03-11 10:38 ` Marc Zyngier
2013-03-11 10:38 ` Marc Zyngier
2013-03-11 11:02 ` Gleb Natapov
2013-03-11 11:02 ` Gleb Natapov
2013-03-11 15:58 ` Christoffer Dall
2013-03-11 15:58 ` Christoffer Dall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130307184037.GE24444@redhat.com \
--to=gleb@redhat.com \
--cc=cdall@cs.columbia.edu \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=marc.zyngier@arm.com \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.