On 11 November 2013 07:10, Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote: > Il 11/11/2013 15:56, Christoffer Dall ha scritto: >>> > Christoffer and Marc, please coordinate so that arm+arm64 patch go only >>> > through one person. The conflict between your two pull requests was not >>> > really necessary. >>> > >> I don't think the same patch was in both pull requests, right? > > No, this patch conflicted with "arm/arm64: KVM: PSCI: use MPIDR to > identify a target CPU" from your tree. Both touched > arch/arm/include/asm/kvm_emulate.h and arch/arm64/include/asm/kvm_emulate.h > >> Is what you're saying that any patch that touches arm and arm64 should >> always come from one of us so that you reduce the chance of a merge >> conflict? > > Yes---note that it doesn't have to be *always* the same person; whatever > works best for you probably works best for me too. In this case all of > them were written by Marc, it would have been even simpler for you to > just give your Acked-by instead of picking up "arm/arm64: KVM: PSCI: use > MPIDR to identify a target CPU". I don't think it would have made much sense - that patch was part of a series that was touching mainly arch/arm/kvm/* and therefore I included it in my pull. It would have been strange to have a kvm-arm-next tree that included 75% of the functionality because Marc happens to have another patch that touches arch/arm and arch/arm64 and have two untestable trees until the merge window... > >> There would still be the case where I carry those arm/arm64 >> patches but the arm64 changes conflict with those in Marc's tree, no? > > Yes, that can still happen. Conflicts are not bad, only inconsistencies > are. > Not sure what you mean and where we could be more consistent to make life easier for you. You say it should always come from the same person, but not necessary always from the same person? Note: I have no problem giving my ack to patches or follow any procedure that makes it easier, but I thought these pull requests were quite clean (albeit a bit late). -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
