Re: [Qemu-trivial] [PATCH v4] correct error message qemu-img reported

[Anthony Liguori]

Hi,

This is an automated message generated from the QEMU Patches.
Thank you for submitting this patch.  This patch no longer applies to qemu.git.

This may have occurred due to:
 
  1) Changes in mainline requiring your patch to be rebased and re-tested.

  2) Sending the mail using a tool other than git-send-email.  Please use
     git-send-email to send patches to QEMU.

  3) Basing this patch off of a branch that isn't tracking the QEMU
     master branch.  If that was done purposefully, please include the name
     of the tree in the subject line in the future to prevent this message.

     For instance: "[PATCH block-next 1/10] qcow3: add fancy new feature"

  4) You no longer wish for this patch to be applied to QEMU.  No additional
     action is required on your part.

Nacked-by: QEMU Patches <address@hidden>

Below is the output from git-am:

    Applying: correct error message qemu-img reported
    Using index info to reconstruct a base tree...
    M   qemu-img.c
    Falling back to patching base and 3-way merge...
    Auto-merging qemu-img.c
    CONFLICT (content): Merge conflict in qemu-img.c
    Failed to merge in the changes.
    Patch failed at 0001 correct error message qemu-img reported
    The copy of the patch that failed is found in:
       /home/aliguori/patches/qemu.git/.git/rebase-apply/patch
    When you have resolved this problem run "git am --resolved".
    If you would prefer to skip this patch, instead run "git am --skip".
    To restore the original branch and stop patching run "git am --abort".