On 06/24/2014 07:08 AM, Wenchao Xia wrote: > δΊ 2014/6/21 4:02, Eric Blake ει: >> On 06/20/2014 01:49 PM, Paolo Bonzini wrote: >> >>> >>> As I explained on IRC, many patches when rebased would have conflicts >>> with Igor's new event. I think this is much more complex than having >>> an "extraordinary" merge commit. >>> >>> I include the conflict resolution: >>> >>> - hw/acpi/memory-hotplug.c is only present in mst's branch, so I'm >>> including the diff from there (changing to the QAPI event style) >>> >>> - qapi-event.json is only present in luiz's branch, so I'm >>> including the diff from there (adding the ACPI_DEVICE_OST event) >> >> One other alternative would have been to pull out the new >> ACPI_DEVICE_OST patches out of mst's branch, and upgrade them to Igor's >> v3 which applies on top of Wenchao's work: >> https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg04927.html >> > > So which way to go now?
Rebase your cleanups on to of this PULL request: https://lists.gnu.org/archive/html/qemu-devel/2014-06/msg05424.html -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
