On 11/13/20 3:49 AM, Kevin Wolf wrote:
> Am 23.09.2020 um 22:37 hat Eric Blake geschrieben:
>> Missed during merge resolution of commit bc5ee6da71.
>>
>> Signed-off-by: Eric Blake
>> ---
>> docs/tools/qemu-img.rst | 4
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/docs/tools/qemu-img
Am 23.09.2020 um 22:37 hat Eric Blake geschrieben:
> Missed during merge resolution of commit bc5ee6da71.
>
> Signed-off-by: Eric Blake
> ---
> docs/tools/qemu-img.rst | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
> index c35bd648
Ping^2
On 10/20/20 10:44 AM, Eric Blake wrote:
> On 9/23/20 4:56 PM, Nir Soffer wrote:
>> On Wed, Sep 23, 2020 at 11:38 PM Eric Blake wrote:
>>>
>>> Missed during merge resolution of commit bc5ee6da71.
>>>
>>> Signed-off-by: Eric Blake
>>> ---
>>> docs/tools/qemu-img.rst | 4
>>> 1 file ch
On 9/23/20 4:56 PM, Nir Soffer wrote:
> On Wed, Sep 23, 2020 at 11:38 PM Eric Blake wrote:
>>
>> Missed during merge resolution of commit bc5ee6da71.
>>
>> Signed-off-by: Eric Blake
>> ---
>> docs/tools/qemu-img.rst | 4
>> 1 file changed, 4 insertions(+)
>>
>> diff --git a/docs/tools/qemu-
On Wed, Sep 23, 2020 at 11:38 PM Eric Blake wrote:
>
> Missed during merge resolution of commit bc5ee6da71.
>
> Signed-off-by: Eric Blake
> ---
> docs/tools/qemu-img.rst | 4
> 1 file changed, 4 insertions(+)
>
> diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
> index c35bd64
Missed during merge resolution of commit bc5ee6da71.
Signed-off-by: Eric Blake
---
docs/tools/qemu-img.rst | 4
1 file changed, 4 insertions(+)
diff --git a/docs/tools/qemu-img.rst b/docs/tools/qemu-img.rst
index c35bd6482203..2b5891b54db7 100644
--- a/docs/tools/qemu-img.rst
+++ b/docs/to