From mboxrd@z Thu Jan 1 00:00:00 1970 From: pbonzini@redhat.com (Paolo Bonzini) Date: Mon, 12 Jan 2015 19:36:14 +0100 Subject: [GIT PULL 0/2] KVM/ARM Fixes for 3.19 In-Reply-To: <20150112171923.GA24754@cbox> References: <1420981811-18731-1-git-send-email-christoffer.dall@linaro.org> <54B39EA4.50808@redhat.com> <20150112171923.GA24754@cbox> Message-ID: <54B4141E.5070602@redhat.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [GIT PULL 0/2] KVM/ARM Fixes for 3.19 Date: Mon, 12 Jan 2015 19:36:14 +0100 Message-ID: <54B4141E.5070602@redhat.com> References: <1420981811-18731-1-git-send-email-christoffer.dall@linaro.org> <54B39EA4.50808@redhat.com> <20150112171923.GA24754@cbox> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvm@vger.kernel.org To: Christoffer Dall Return-path: Received: from mx1.redhat.com ([209.132.183.28]:56366 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755261AbbALSgw (ORCPT ); Mon, 12 Jan 2015 13:36:52 -0500 In-Reply-To: <20150112171923.GA24754@cbox> Sender: kvm-owner@vger.kernel.org List-ID: 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