From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55567) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsGFq-0006Fd-41 for qemu-devel@nongnu.org; Tue, 12 May 2015 15:54:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsGFp-0002jO-7p for qemu-devel@nongnu.org; Tue, 12 May 2015 15:54:14 -0400 Message-ID: <55525A5C.7030709@redhat.com> Date: Tue, 12 May 2015 15:54:04 -0400 From: John Snow MIME-Version: 1.0 References: <1431446962-9860-1-git-send-email-berrange@redhat.com> <1431446962-9860-6-git-send-email-berrange@redhat.com> <555247FC.4060009@redhat.com> <55524F36.2010908@redhat.com> <55525A13.2050500@redhat.com> In-Reply-To: <55525A13.2050500@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [Qemu-block] [PATCH 5/5] tests: add test case for encrypted qcow2 read/write List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Fam Zheng , qemu-block@nongnu.org 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