On 16 March 2017 at 02:34, Michael S. Tsirkin <mst@redhat.com> wrote:
> The following changes since commit 1883ff34b540daacae948f493b0ba525edf5f642:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2017-03-15 18:44:05 +0000)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to bdf4c4ec53f293ea1baa7ce7c31fe0301887b513:
>
> virtio-serial-bus: Delete timer from list before free it (2017-03-16 01:46:42 +0200)
>
> ----------------------------------------------------------------
> virtio, pci: fixes
>
> More fixes missed in the previous pull request.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Marcel Apfelbaum (4):
> hw/pcie: fix Extended Configuration Space for devices with no Extended Capabilities
> hw/virtio: fix error enabling flags in Device Control register
> hw/virtio: fix Link Control Register for PCI Express virtio devices
> hw/virtio: fix Power Management Control Register for PCI Express virtio devices
>
> zhanghailiang (1):
> virtio-serial-bus: Delete timer from list before free it
>
> hw/virtio/virtio-pci.h | 12 ++++++++++++
> include/hw/compat.h | 16 ++++++++++++++++
> include/hw/pci/pci.h | 2 ++
> include/hw/pci/pcie.h | 5 +++++
> hw/char/virtio-serial-bus.c | 1 +
> hw/pci/pci.c | 2 ++
> hw/pci/pcie.c | 20 ++++++++++++++++++++
> hw/virtio/virtio-pci.c | 31 +++++++++++++++++++++++++++++++
> dtc | 2 +-
> 9 files changed, 90 insertions(+), 1 deletion(-)
This has an incorrect submodule revert in it, and I missed it before
pushing it to master :-(
This is the second pullreq from you this release cycle with a bogus
submodule change in it -- please can you fix your workflow/checks
somehow to prevent this happening?
thanks
-- PMM