[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [Qemu-block] [PATCH] qemu-iotests: Fix reference output
|
From: |
Max Reitz |
|
Subject: |
Re: [Qemu-devel] [Qemu-block] [PATCH] qemu-iotests: Fix reference output for 186 |
|
Date: |
Tue, 25 Jul 2017 16:55:37 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 |
On 2017-07-25 10:59, 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 consider the changes of 70f17a1.
>
> Signed-off-by: Kevin Wolf <address@hidden>
> ---
> tests/qemu-iotests/186.out | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks, applied to my block tree:
https://github.com/XanClic/qemu/commits/block
Max
signature.asc
Description: OpenPGP digital signature