[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 00/13] pci, pc fixes, features
|
From: |
Peter Maydell |
|
Subject: |
Re: [Qemu-devel] [PULL 00/13] pci, pc fixes, features |
|
Date: |
Thu, 4 Sep 2014 13:33:10 +0100 |
On 4 September 2014 12:11, Peter Maydell <address@hidden> wrote:
> On 3 September 2014 12:26, Michael S. Tsirkin <address@hidden> wrote:
>> A problem was reported with this one.
>> I fixed it up, will send v2 pull.
>
> I accidentally just merged the v1 by mistake :-(
> Sorry about that; I'm going to merge in the v2 (it conflicts
> in vhost_net.c but fairly trivially so I'll fix that up) and then
> we should get to where we were intending to go. Apologies
> for the error.
As discussed on IRC, reverted the incorrect vhost_net
commit and then cleanly merged in the v2 pull.
Apologies again for this mess.
-- PMM
- [Qemu-devel] [PULL 09/13] vhost_net: cleanup start/stop condition, (continued)
- [Qemu-devel] [PULL 09/13] vhost_net: cleanup start/stop condition, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 08/13] intel-iommu: add IOTLB using hash table, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 10/13] ioh3420: remove unused ioh3420_init() declaration, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 11/13] virtio-net: don't run bh on vm stopped, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 12/13] pci: avoid losing config updates to MSI/MSIX cap regs, Michael S. Tsirkin, 2014/09/02
- [Qemu-devel] [PULL 13/13] vhost_net: start/stop guest notifiers properly, Michael S. Tsirkin, 2014/09/02
- Re: [Qemu-devel] [PULL 00/13] pci, pc fixes, features, Michael S. Tsirkin, 2014/09/03