Re: [Qemu-devel] [PATCH 00/15] qdev: make reset semantics more clear and consistent, reset qbuses under virtio devices

[Anthony Liguori <aliguori@us.ibm.com>]

Sorry for breaking threading... I've fixed that bug.

FWIW, the reason this got notified but other patches haven't is that as
of this afternoon, this patch no longer applies but it did apply before my earlier
commits.  So it's the first patch series to get identified by my scripts.

Regards,

Anthony Liguori

Anthony Liguori <aliguori@us.ibm.com> writes:

> 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 <aliguori@us.ibm.com>
>
> Below is the output from git-am:
>
>     Applying: qdev: do not reset a device until the parent has been initialized
>     Applying: intel-hda: do not reset codecs from intel_hda_reset
>     Applying: pci: clean up resetting of IRQs
>     Using index info to reconstruct a base tree...
>     A	hw/pci.c
>     Falling back to patching base and 3-way merge...
>     Auto-merging hw/pci/pci.c
>     Applying: virtio-pci: reset device before PCI layer
>     Using index info to reconstruct a base tree...
>     M	hw/virtio-pci.c
>     Falling back to patching base and 3-way merge...
>     Auto-merging hw/virtio-pci.c
>     CONFLICT (content): Merge conflict in hw/virtio-pci.c
>     Failed to merge in the changes.
>     Patch failed at 0004 virtio-pci: reset device before PCI layer
>     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".