From: Marcelo Tosatti <mtosatti@redhat.com>
To: Paul Mackerras <paulus@samba.org>
Cc: Gleb Natapov <gleb@redhat.com>, Alexander Graf <agraf@suse.de>,
Scott Wood <scottwood@freescale.com>,
kvm-ppc@vger.kernel.org,
"kvm@vger.kernel.org mailing list" <kvm@vger.kernel.org>
Subject: Re: [PULL 0/7] ppc patch queue 2013-03-22
Date: Thu, 11 Apr 2013 10:45:15 -0300 [thread overview]
Message-ID: <20130411134515.GB478@amt.cnet> (raw)
In-Reply-To: <20130326015904.GA31060@drongo>
On Tue, Mar 26, 2013 at 12:59:04PM +1100, Paul Mackerras wrote:
> On Tue, Mar 26, 2013 at 03:33:12AM +0200, Gleb Natapov wrote:
> > On Tue, Mar 26, 2013 at 12:35:09AM +0100, Alexander Graf wrote:
> > > I agree. So if it doesn't hurt to have the same commits in kvm/next and kvm/master, I'd be more than happy to send another pull request with the important fixes against kvm/master as well.
> > >
> > If it will result in the same commit showing twice in the Linus tree in 3.10 we cannot do that.
>
> Why not? In the circumstances it seems perfectly reasonable to me.
> Git should merge the branches without any problem, and even if it
> doesn't, Linus is good at fixing merge conflicts.
>
> Paul.
Yes, should avoid duplicate commits but its not fatal for them to exist.
next prev parent reply other threads:[~2013-04-11 13:45 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-22 14:25 [PULL 0/7] ppc patch queue 2013-03-22 Alexander Graf
2013-03-22 14:25 ` [PATCH 1/7] KVM: PPC: move tsr update in a separate function Alexander Graf
2013-03-22 14:25 ` [PATCH 2/7] KVM: PPC: Added one_reg interface for timer registers Alexander Graf
2013-03-22 14:25 ` [PATCH 3/7] KVM: PPC: booke: Added debug handler Alexander Graf
2013-03-22 14:26 ` [PATCH 4/7] kvm/ppc/e500: h2g_tlb1_rmap: esel 0 is valid Alexander Graf
2013-03-22 14:26 ` [PATCH 5/7] kvm/ppc/e500: g2h_tlb1_map: clear old bit before setting new bit Alexander Graf
2013-03-22 14:26 ` [PATCH 6/7] kvm/ppc/e500: eliminate tlb_refs Alexander Graf
2013-03-22 14:26 ` [PATCH 7/7] KVM: PPC: Remove unused argument to kvmppc_core_dequeue_external Alexander Graf
2013-03-24 9:45 ` [PULL 0/7] ppc patch queue 2013-03-22 Gleb Natapov
2013-03-25 22:21 ` Scott Wood
2013-03-25 22:32 ` Alexander Graf
2013-03-25 22:54 ` Scott Wood
2013-03-25 22:59 ` Alexander Graf
2013-03-25 23:16 ` Scott Wood
2013-03-25 23:35 ` Alexander Graf
2013-03-26 1:33 ` Gleb Natapov
2013-03-26 1:59 ` Paul Mackerras
2013-04-11 13:45 ` Marcelo Tosatti [this message]
2013-04-11 13:50 ` Alexander Graf
2013-04-12 20:54 ` Marcelo Tosatti
2013-04-12 20:56 ` Alexander Graf
2013-04-16 17:26 ` Alexander Graf
2013-04-16 21:28 ` Marcelo Tosatti
2013-03-26 16:37 ` Scott Wood
2013-03-31 10:49 ` Gleb Natapov
2013-03-31 11:05 ` Alexander Graf
2013-04-08 18:17 ` Scott Wood
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=20130411134515.GB478@amt.cnet \
--to=mtosatti@redhat.com \
--cc=agraf@suse.de \
--cc=gleb@redhat.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=paulus@samba.org \
--cc=scottwood@freescale.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox