On 20/07/2016 07:46, Michael Ellerman wrote: > Thanks. > > Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > > Or do you want me to merge this before Paul gets back? No, this should be merged through the KVM tree. Please Cc the KVM maintainers before offering to apply a patch that formally belongs to another tree. I don't care if Paul merges the patch or Radim and I do, but we're getting lots of unnecessary conflicts from patches that go through the main architecture tree and that shouldn't really happen. Please let's keep some discipline, as I want to minimize the number of conflicts that reach Linus (and 4.8 is going to be *bad* in this respect, with both PPC and s390 having conflicts between the KVM and arch tree). In particular this patch would indeed have a conflict, because you have +#define KVM_CAP_PPC_HTM 129 but cap numbers 129 and 130 are already taken. So whoever applies it should bump the number to 131. 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
