Re: [Qemu-devel] [PATCH] qemu-iotests: Fix reference output for 186

2017-07-25 Thread Stefan Hajnoczi
On Tue, Jul 25, 2017 at 10:59:36AM +0200, Kevin Wolf wrote: > Commits 70f17a1 ('error: Revert unwanted change of warning messages') > and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge > conflict, which results in failure for qemu-iotests case 186. Fix the > reference output to co

Re: [Qemu-devel] [PATCH] qemu-iotests: Fix reference output for 186

2017-07-25 Thread Markus Armbruster
Kevin Wolf writes: > Commits 70f17a1 ('error: Revert unwanted change of warning messages') > and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge > conflict, which results in failure for qemu-iotests case 186. Fix the > reference output to consider the changes of 70f17a1. > > Sign

[Qemu-devel] [PATCH] qemu-iotests: Fix reference output for 186

2017-07-25 Thread Kevin Wolf
Commits 70f17a1 ('error: Revert unwanted change of warning messages') and e1824e5 ('qemu-iotests: Test 'info block'') had a semantic merge conflict, which results in failure for qemu-iotests case 186. Fix the reference output to consider the changes of 70f17a1. Signed-off-by: Kevin Wolf --- test