[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features |
Date: |
Thu, 20 Dec 2018 16:11:05 +0100 |
On Thu, 20 Dec 2018 14:52:49 +0000
Peter Maydell <address@hidden> wrote:
> On Thu, 20 Dec 2018 at 14:50, Igor Mammedov <address@hidden> wrote:
> >
> > On Wed, 19 Dec 2018 19:15:26 +0000
> > Peter Maydell <address@hidden> wrote:
> > > Hi; I'm afraid I get conflicts in some files which look
> > > too complicated for me to want to try to resolve at this end:
> > > Auto-merging tests/vmgenid-test.c
> > > CONFLICT (content): Merge conflict in tests/vmgenid-test.c
> > > Auto-merging tests/bios-tables-test.c
> > > CONFLICT (content): Merge conflict in tests/bios-tables-test.c
> > > Auto-merging tests/acpi-utils.h
> > > CONFLICT (content): Merge conflict in tests/acpi-utils.h
> > > Auto-merging tests/acpi-utils.c
> > > CONFLICT (content): Merge conflict in tests/acpi-utils.c
> > > Removing include/hw/smbios/ipmi.h
> >
> > I'm working on fixing conflicts due to 29/30 and will include conflicting
> > patch in my acpi tests cleanup on respin
> >
> > Meanwhile could you drop 29/30 and apply the rest of pull request (which
> > applies just fine)?
>
> I can't apply a partial pull request -- MST will need to
> drop those patches and send a v2.
ok
I'll post fixed up patch here for MST to pick it up
PS:
/me need to learn how to do pull requests
>
> thanks
> -- PMM
- [Qemu-devel] [PULL v2 27/30] hw: arm: Support both legacy and current RSDP build, (continued)
- [Qemu-devel] [PULL v2 27/30] hw: arm: Support both legacy and current RSDP build, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 26/30] hw: arm: Convert the RSDP build to the buid_append_foo() API, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 25/30] hw: arm: Carry RSDP specific data through AcpiRsdpData, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 29/30] hw: acpi: Remove AcpiRsdpDescriptor and fix tests, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 30/30] hw/i386: Remove deprecated machines pc-0.10 and pc-0.11, Michael S. Tsirkin, 2018/12/18
- [Qemu-devel] [PULL v2 28/30] hw: acpi: Export and share the ARM RSDP build, Michael S. Tsirkin, 2018/12/18
- Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features, Peter Maydell, 2018/12/19
- Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features, Igor Mammedov, 2018/12/20
- Re: [Qemu-devel] [PULL v2 00/30] pci, pc, virtio: fixes, features, Michael S. Tsirkin, 2018/12/20