From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzQeV-00072w-FU for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:20:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WzQeP-0007YG-Ml for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:20:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WzQeP-0007Y2-E6 for qemu-devel@nongnu.org; Tue, 24 Jun 2014 09:20:41 -0400 Message-ID: <53A97B24.7060108@redhat.com> Date: Tue, 24 Jun 2014 07:20:36 -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> <53A49358.40703@redhat.com> <53A97832.7080507@gmail.com> In-Reply-To: <53A97832.7080507@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="rifLJp3b0OKWkFwn4vVe9dVGVSwmnBsi7" 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: Wenchao Xia , Paolo Bonzini , Luiz Capitulino , Peter Maydell Cc: QEMU Developers , Anthony Liguori , "Michael S. Tsirkin" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --rifLJp3b0OKWkFwn4vVe9dVGVSwmnBsi7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/24/2014 07:08 AM, Wenchao Xia wrote: > =E4=BA=8E 2014/6/21 4:02, Eric Blake =E5=86=99=E9=81=93: >> 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 >> >=20 > 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 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --rifLJp3b0OKWkFwn4vVe9dVGVSwmnBsi7 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/ iQEcBAEBCAAGBQJTqXskAAoJEKeha0olJ0NqJEkIAJO5eZ/uY7fS0ycdjnEhDrPh vkC461kHtzXTrwotEHJ6wn/sswQRJ51HwDFQ0Is6X3A1/vwTllHCgdvje9+Cnj5G AnUF/HAu2lCXaQJXxktffr0KDJFy06TKfxlb44WSuvZKxnFglNgL+lBrcXJEymb3 vrU18xGAQYVFP2kYBzsB6yGN9EbeuJU5NYQs//AnWGAkH88lq/NPox4Inu4upRwP UzSxWjbC6WjSvP2mr5ttIobCocvqTAozRY/4l2/ORWAlNpTXi164KwCRLG2P+1YP 6nJCuWrwwCm9b04a5BoSJG3s93HMHTLvctz1ezrrW/Ux4mbWbUg6ttvhApWVztM= =tCUQ -----END PGP SIGNATURE----- --rifLJp3b0OKWkFwn4vVe9dVGVSwmnBsi7--