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". > There would still be the case where I carry those arm/arm64 > patches but th arm64 changes conflict with those in Marc's tree, no? Yes, that can still happen. Conflicts are not bad, only inconsistencies are. Paolo -- 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
