On 31/03/2015 18:11, Paolo Bonzini wrote: > > > On 31/03/2015 15:01, Christian Borntraeger wrote: >> git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-next-20150331 > > Looks good, pulled. Oops, spoke too soon! It conflicts with the MIPS pull request due to overlapping capability numbers. Please use 113 and 114; since the MIPS pull request is in kvm/queue only, do not rebase: just fix the two numbers and I'll resolve the conflict myself. Paolo -- To unsubscribe from this list: send the line "unsubscribe linux-s390" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
