From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7q7-00077a-BG for qemu-devel@nongnu.org; Mon, 23 Jun 2014 13:15:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wz7q2-0004Y8-67 for qemu-devel@nongnu.org; Mon, 23 Jun 2014 13:15:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wz7q1-0004XA-Ju for qemu-devel@nongnu.org; Mon, 23 Jun 2014 13:15:25 -0400 Message-ID: <53A860A8.8060406@redhat.com> Date: Mon, 23 Jun 2014 11:15:20 -0600 From: Eric Blake MIME-Version: 1.0 References: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1403541403-16468-1-git-send-email-lcapitulino@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qtcamwiOnMtgomfxHmjTDJH3X0N8Od0dW" Subject: Re: [Qemu-devel] [PULL 00/43] QMP queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino , peter.maydell@linaro.org Cc: qemu-devel@nongnu.org, anthony@codemonkey.ws This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --qtcamwiOnMtgomfxHmjTDJH3X0N8Od0dW Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/23/2014 10:36 AM, Luiz Capitulino wrote: > The following changes since commit d9c1647d896d3192cba9dbf98fb7efab876e= dde5: >=20 > Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-reques= t' into staging (2014-06-23 12:55:22 +0100) >=20 > are available in the git repository at: >=20 >=20 > git://repo.or.cz/qemu/qmp-unstable.git queue/qmp >=20 > for you to fetch changes up to d622cb5879ca8006d5482158e4e3b272a068c301= : >=20 > monitor: protect event emission (2014-06-23 11:12:28 -0400) >=20 > ---------------------------------------------------------------- >=20 > I've included a fix from Igor that fixes the most serious conflict from= my > last pull request. Besides, I've fixed some trivial to medium conflicts= myself > and included my two build fixes. Build tested and tested most events ag= ain. I've had a look over this pull request, and the conflict resolution appears to be sane (the injection of 33/43 compared to the previous pull request made a huge difference in ease-of-resolution). It also passed my build test locally. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --qtcamwiOnMtgomfxHmjTDJH3X0N8Od0dW 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/ iQEcBAEBCAAGBQJTqGCoAAoJEKeha0olJ0NqJ5oH/0x4DRZ79Sqwyz1xWpbhzf/w 4omY5pskZonWBb5BRVjN4QGUEro9YGztE7ILxYnYFhWM3YQJPz1zp0UhyMVQuY7f I8040d5REQhFB7o2RCAtzcNpS/6t5a93NjK63pk8rdMPIjnuv0HjyYzFLbdxL+2+ 0vKVru7f2YfxvExp7vjIiMuYBoGX26NHQb80p95UdXHZNcFtSkBpdGVjKK8FU+hE ev72TR7cjEI95I+TNGCCNsQeEAyrLe3KE0doHxB2M2S9Ueuq9JSX/058ctdt9ltI zhOprkY/zKcUvSqOWoFGJRmrNiILdpJH40Wc2PLMGDai1ZXRF0zNvBt5gRx5z+8= =TyZA -----END PGP SIGNATURE----- --qtcamwiOnMtgomfxHmjTDJH3X0N8Od0dW--