On 05/12/2015 03:52 PM, Eric Blake wrote: > On 05/12/2015 01:06 PM, John Snow wrote: >>>> tests/qemu-iotests/131 | 69 >>>> ++++++++++++++++++++++++++++++++++++++++++++++ >>>> tests/qemu-iotests/131.out | 46 >>>> +++++++++++++++++++++++++++++++ > >> >> Fam Zheng already has a patch on-list that uses test 131, and I >> think his patch was submitted first. >> >> (Unless we want to play the "Who gets merged first?" game.) > > That's the sort of conflict that I expect a maintainer can clean > up, if there is no other reason for a respin (although it is not > always easy to coax git into understanding that a patch would be > valid if the file is renamed. >
Sure, whoever fixes it. Just pointing it out. --js
