On 20/07/2016 08:30, Paolo Bonzini wrote: > 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. Applied now, it's 132. Paolo