From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy51K-0005kX-QV for qemu-devel@nongnu.org; Fri, 20 Jun 2014 16:02:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wy51C-00040f-2G for qemu-devel@nongnu.org; Fri, 20 Jun 2014 16:02:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34769) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wy51B-0003zm-QE for qemu-devel@nongnu.org; Fri, 20 Jun 2014 16:02:37 -0400 Message-ID: <53A49358.40703@redhat.com> Date: Fri, 20 Jun 2014 14:02:32 -0600 From: Eric Blake MIME-Version: 1.0 References: <1403206792-15387-1-git-send-email-lcapitulino@redhat.com> <20140620144422.423ea957@redhat.com> <53A49053.5080606@redhat.com> In-Reply-To: <53A49053.5080606@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="TSgATgfg8JhAmojcJHKnPUtpGQkfqg0KC" 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: Paolo Bonzini , Luiz Capitulino , Peter Maydell Cc: "Michael S. Tsirkin" , QEMU Developers , Anthony Liguori , wenchaoqemu@gmail.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --TSgATgfg8JhAmojcJHKnPUtpGQkfqg0KC Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/20/2014 01:49 PM, Paolo Bonzini wrote: >=20 > As I explained on IRC, many patches when rebased would have conflicts=20 > with Igor's new event. I think this is much more complex than having=20 > an "extraordinary" merge commit. >=20 > I include the conflict resolution: >=20 > - 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) >=20 > - 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 >=20 > -=20 > Paolo >=20 > a76d72f692ed5f4f30f116cc9c3ac5fefe221cb7 > Merge: 0a99aae b98ff90 > Author: Paolo Bonzini > Date: Fri Jun 20 21:18:08 2014 +0200 >=20 > Merge commit b98ff90e9459e0113da8502c03670a9539f90aa1 of git://repo= =2Eor.cz/qemu/qmp-unstable into HEAD > =20 > 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 conversi= on] > monitor.c [QMP event enum removed by QAPI conversion] > qapi-schema.json [trivial, code added by both sides in the same pl= ace] > qemu-char.c [trivial, code added by both sides in the same place] > vl.c [trivial header file conflict] > =20 > Other files changed: > qapi-event.json [include ACPI_DEVICE_OST event] > hw/acpi/memory-hotplug.c [use QAPI event] > =20 > Signed-off-by: Paolo Bonzini If you are okay taking this complex merge patch, you can add: Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --TSgATgfg8JhAmojcJHKnPUtpGQkfqg0KC Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEbBAEBCAAGBQJTpJNYAAoJEKeha0olJ0NqmAQH+JAeARYilsBrcAuqbWn6gNBf ln4Y8df2J6c2GkLcxw+SA177wYepiucnBcwuwo8uxbEsS/9oZ9Z3YL7XVHynVvv4 EdZ0j3Tp95QLkvS36eV3GbvPcI6NEd4YodbSUZjy/8ioQVNcOWs74iKzAFYXxR5r sxKhuzo/zj/V6Tx1fCm0f6xGjjskE9E1WpqAz1bBpv71qArU3AHwy/k4C0TPu5kJ 5u2YZplI9r5cWsxQ99/CEoqdmFVMIdWZ4+dxXrXYw+nypZuyFqOV2kJSN55jPVJB cehWEasyT719FgXYleYBzkMqGE1FDadNlVpLbVj1NH4DTKLo+kil2ZdvsrCagw== =DSBY -----END PGP SIGNATURE----- --TSgATgfg8JhAmojcJHKnPUtpGQkfqg0KC--