From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZm0-0000aG-96 for qemu-devel@nongnu.org; Fri, 22 Jul 2016 08:41:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bQZlw-0006dR-2z for qemu-devel@nongnu.org; Fri, 22 Jul 2016 08:41:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58050) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bQZlv-0006dF-QF for qemu-devel@nongnu.org; Fri, 22 Jul 2016 08:41:44 -0400 References: <20160719224730.6948-1-mreitz@redhat.com> <578FEA13.1090001@redhat.com> From: Max Reitz Message-ID: <26ffe26f-43c0-44f5-672b-683186c00b9b@redhat.com> Date: Fri, 22 Jul 2016 14:41:39 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uOo42i4KmTgkhAomxIEXsadtbm5iXEblx" Subject: Re: [Qemu-devel] [PULL 0/4] Block patches List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , Eric Blake Cc: QEMU Developers , "Daniel P. Berrange" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --uOo42i4KmTgkhAomxIEXsadtbm5iXEblx From: Max Reitz To: Peter Maydell , Eric Blake Cc: QEMU Developers , "Daniel P. Berrange" Message-ID: <26ffe26f-43c0-44f5-672b-683186c00b9b@redhat.com> Subject: Re: [Qemu-devel] [PULL 0/4] Block patches References: <20160719224730.6948-1-mreitz@redhat.com> <578FEA13.1090001@redhat.com> In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 21.07.2016 21:14, Peter Maydell wrote: > On 20 July 2016 at 22:16, Eric Blake wrote: >> On 07/20/2016 10:05 AM, Peter Maydell wrote: >>> On 19 July 2016 at 23:47, Max Reitz wrote: >>>> The following changes since commit 5d3217340adcb6c4f0e4af5d2b865331e= b2ff63d: >>>> >>>> disas: Fix ATTRIBUTE_UNUSED define clash with ALSA headers (2016-0= 7-19 16:40:39 +0100) >>>> >>>> are available in the git repository at: >>>> >>>> git://github.com/XanClic/qemu.git tags/pull-block-2016-07-20 >>>> >>>> for you to fetch changes up to bafea5b7c26dd14895f7be64685a12645a75f= 4cf: >>>> >>>> block: export LUKS specific data to qemu-img info (2016-07-20 00:3= 4:03 +0200) >>>> >>>> ---------------------------------------------------------------- >>>> Block patches for master >>>> >>>> ---------------------------------------------------------------- >>> >>> Fails to build on everything: >>> >>> GEN qapi-visit.h >>> In file included from /Users/pm215/src/qemu-for-merges/qapi-schema.js= on:9: >>> /Users/pm215/src/qemu-for-merges/qapi/crypto.json:299: Union >>> 'QCryptoBlockInfo' data missing 'qcow' branch >> >> Aha. Cause is two branches developed in parallel; commit d0b18239 forc= es >> all branches of a flat union to be listed (to avoid an abort() if the >> user passes a branch that was not listed); solution is to expand the >> crypto.json addition to cover all branches, even if it means an empty >> type for the branches that have no additional data. >=20 > I'm just processing the last other outstanding pullreq now, > so unless a respin of this arrives by tomorrow lunchtime UK > time it's going to miss rc0, I think. Since there's nothing critical in this pull request, I'll drop the crypto patches and keep the non-offending patches for the next pull request (for rc1). So no need to wait for another pull request from me for rc0. Max --uOo42i4KmTgkhAomxIEXsadtbm5iXEblx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEvBAEBCAAZBQJXkhSDEhxtcmVpdHpAcmVkaGF0LmNvbQAKCRA7sUIC6DisrZwp B/9lXO37sLp7HB7tdFKKgNIlAy/2iRED0ScFlDgPNtfx0LcmaI4aYSlMyzPHe4jx Fm381bs9NvtfwRA53Fu+erSd28efTBGmXOv8MajA4BcuMVK58MYsrNCEFmEJyUA/ 9HN7W7IwADA6fGs6sTJCcPXMkXHZtej55pZ+WjdyImQsUCZ2WRFBw9ZHoUMCSLCW m7vEJViWuGfMG9OMLMaUU5RDJmKZxXCud7oyG9sa4jXmPNNJRRSJ6Xa95mPOgcI4 Mxwz7oSptm47cWKz4Pu3ajCoruWL6nvVhPMc59+7y/uiM5K/CYeMk8kV/yJXbYIu 73PamZ1IFYEady62uWlXYfVb =HX9I -----END PGP SIGNATURE----- --uOo42i4KmTgkhAomxIEXsadtbm5iXEblx--