From: Eric Blake <eblake@redhat.com>
To: Kevin Wolf <kwolf@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org
Subject: Re: [PATCH] docs: Better mention of qemu-img amend limitations
Date: Fri, 13 Nov 2020 07:40:18 -0600 [thread overview]
Message-ID: <395f0c67-6526-6621-3e49-a87e76c2a0d3@redhat.com> (raw)
In-Reply-To: <20201113094956.GC5834@merkur.fritz.box>
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 <eblake@redhat.com>
>> ---
>> 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/tools/qemu-img.rst
>> @@ -265,6 +265,10 @@ Command description:
>
> Adding a little more context:
>
>> The set of options that can be amended are dependent on the image
>> format, but note that amending the backing chain relationship should
>> instead be performed with ``qemu-img rebase``.
>>
>> --force allows some unsafe operations. Currently for -f luks, it allows to
>> erase the last encryption key, and to overwrite an active encryption key.
>>
>> + The set of options that can be amended are dependent on the image
>> + format, but note that amending the backing chain relationship should
>> + instead be performed with ``qemu-img rebase``.
>> +
>
> I think the problem is your local conflict resolution. This patch would
> duplicate the paragraph.
D'oh. Thanks for spotting that, patch withdrawn.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
prev parent reply other threads:[~2020-11-13 13:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 20:37 [PATCH] docs: Better mention of qemu-img amend limitations Eric Blake
2020-09-23 21:56 ` Nir Soffer
2020-10-20 15:44 ` Eric Blake
2020-11-12 21:10 ` Eric Blake
2020-11-13 9:49 ` Kevin Wolf
2020-11-13 13:40 ` Eric Blake [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=395f0c67-6526-6621-3e49-a87e76c2a0d3@redhat.com \
--to=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).