From: pbonzini@redhat.com (Paolo Bonzini)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 0/2] KVM/ARM Fixes for 3.19
Date: Mon, 12 Jan 2015 19:36:14 +0100 [thread overview]
Message-ID: <54B4141E.5070602@redhat.com> (raw)
In-Reply-To: <20150112171923.GA24754@cbox>
On 12/01/2015 18:19, Christoffer Dall wrote:
>> > Hmm, that's a bit ugly. I'll apply the patches directly too, please do
>> > a "git reset --hard kvm/master" before applying more stuff.
>> >
> ok, we did try to (and say publicly) that we'd keep kvmarm/master a
> stable branch (like it also says about kvm/master on the KVM wiki), so
> that's why I did this.
>
> I guess we can just require people that follow kvmarm/master (if any) to
> deal with things accordingly.
Yeah, I agree that this shouldn't have happened.
It's not the end of the world. People that pull from kvmarm/master will
almost always rebase their trees, and the rebase will discard the
duplicate patches.
The big problem with rebasing happens if you _drop_ patches. In that
case, whoever rebases will keep the patch that you dropped, and most
likely will not notice.
Paolo
WARNING: multiple messages have this Message-ID (diff)
From: Paolo Bonzini <pbonzini@redhat.com>
To: Christoffer Dall <christoffer.dall@linaro.org>
Cc: kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org,
Marc Zyngier <marc.zyngier@arm.com>,
kvm@vger.kernel.org
Subject: Re: [GIT PULL 0/2] KVM/ARM Fixes for 3.19
Date: Mon, 12 Jan 2015 19:36:14 +0100 [thread overview]
Message-ID: <54B4141E.5070602@redhat.com> (raw)
In-Reply-To: <20150112171923.GA24754@cbox>
On 12/01/2015 18:19, Christoffer Dall wrote:
>> > Hmm, that's a bit ugly. I'll apply the patches directly too, please do
>> > a "git reset --hard kvm/master" before applying more stuff.
>> >
> ok, we did try to (and say publicly) that we'd keep kvmarm/master a
> stable branch (like it also says about kvm/master on the KVM wiki), so
> that's why I did this.
>
> I guess we can just require people that follow kvmarm/master (if any) to
> deal with things accordingly.
Yeah, I agree that this shouldn't have happened.
It's not the end of the world. People that pull from kvmarm/master will
almost always rebase their trees, and the rebase will discard the
duplicate patches.
The big problem with rebasing happens if you _drop_ patches. In that
case, whoever rebases will keep the patch that you dropped, and most
likely will not notice.
Paolo
next prev parent reply other threads:[~2015-01-12 18:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-11 13:10 [GIT PULL 0/2] KVM/ARM Fixes for 3.19 Christoffer Dall
2015-01-11 13:10 ` Christoffer Dall
2015-01-11 13:10 ` [GIT PULL 1/2] arm64: KVM: Fix TLB invalidation by IPA/VMID Christoffer Dall
2015-01-11 13:10 ` Christoffer Dall
2015-01-11 13:10 ` [GIT PULL 2/2] arm64: KVM: Fix HCR setting for 32bit guests Christoffer Dall
2015-01-11 13:10 ` Christoffer Dall
2015-01-12 10:15 ` [GIT PULL 0/2] KVM/ARM Fixes for 3.19 Paolo Bonzini
2015-01-12 10:15 ` Paolo Bonzini
2015-01-12 17:19 ` Christoffer Dall
2015-01-12 17:19 ` Christoffer Dall
2015-01-12 18:36 ` Paolo Bonzini [this message]
2015-01-12 18:36 ` Paolo Bonzini
2015-01-12 18:47 ` Christoffer Dall
2015-01-12 18:47 ` 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=54B4141E.5070602@redhat.com \
--to=pbonzini@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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.