From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59665) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzQSm-0008KN-4S for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:08:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzQSe-0002Wp-92 for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:08:40 -0400 Received: from mail-pd0-x230.google.com ([2607:f8b0:400e:c02::230]:40574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzQSe-0002Wa-2s for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:08:32 -0400 Received: by mail-pd0-f176.google.com with SMTP id ft15so232774pdb.21 for ; Tue, 24 Jun 2014 06:08:31 -0700 (PDT) Message-ID: <53A97832.7080507@gmail.com> Date: Tue, 24 Jun 2014 21:08:02 +0800 From: Wenchao Xia MIME-Version: 1.0 References: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> <20140620144422.423ea957@redhat.com> <53A49053.5080606@redhat.com> <53A49358.40703@redhat.com> In-Reply-To: <53A49358.40703@redhat.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PULL for-2.1 00/40] QMP queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake , Paolo Bonzini , Luiz Capitulino , Peter Maydell Cc: QEMU Developers , Anthony Liguori , "Michael S. Tsirkin" 于 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? >> >> - >> Paolo >> >> a76d72f692ed5f4f30f116cc9c3ac5fefe221cb7 >> Merge: 0a99aae b98ff90 >> Author: Paolo Bonzini >> Date: Fri Jun 20 21:18:08 2014 +0200 >> >> Merge commit b98ff90e9459e0113da8502c03670a9539f90aa1 of git://repo.or.cz/qemu/qmp-unstable into HEAD >> >> Conflicts: >> docs/qmp/qmp-events.txt [removed with QAPI event conversion] >> hw/core/qdev.c [trivial header file conflict] >> include/monitor/monitor.h [QMP event enum removed by QAPI conversion] >> monitor.c [QMP event enum removed by QAPI conversion] >> qapi-schema.json [trivial, code added by both sides in the same place] >> qemu-char.c [trivial, code added by both sides in the same place] >> vl.c [trivial header file conflict] >> >> Other files changed: >> qapi-event.json [include ACPI_DEVICE_OST event] >> hw/acpi/memory-hotplug.c [use QAPI event] >> >> Signed-off-by: Paolo Bonzini > > If you are okay taking this complex merge patch, you can add: > > Reviewed-by: Eric Blake >