From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41105)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Z3XTk-0001GF-W9
	for qemu-devel@nongnu.org; Fri, 12 Jun 2015 18:31:13 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Z3XTf-0007G1-Fe
	for qemu-devel@nongnu.org; Fri, 12 Jun 2015 18:31:12 -0400
Received: from mx1.redhat.com ([209.132.183.28]:49063)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eblake@redhat.com>) id 1Z3XTf-0007Fw-AQ
	for qemu-devel@nongnu.org; Fri, 12 Jun 2015 18:31:07 -0400
Message-ID: <557B5DA4.30004@redhat.com>
Date: Fri, 12 Jun 2015 16:31:00 -0600
From: Eric Blake <eblake@redhat.com>
MIME-Version: 1.0
References: <1431948138-14238-1-git-send-email-hw.claudio@gmail.com>	<20150528161841.72032284@redhat.com>	<20150611135356.6ab8d26f@redhat.com>	<87si9x4fbo.fsf@blackfin.pond.sub.org>	<557A99ED.3050209@huawei.com>	<871thh2ig0.fsf@blackfin.pond.sub.org>
	<CANv_3Ybc6Qme2YwKjHBwmshEyqpAejUDBjKp7kUjvtHScCOsAg@mail.gmail.com>
In-Reply-To: <CANv_3Ybc6Qme2YwKjHBwmshEyqpAejUDBjKp7kUjvtHScCOsAg@mail.gmail.com>
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature";
	boundary="W5UPxuLHTbujvOmH9j3HP3QRT2LPHGxsW"
Subject: Re: [Qemu-devel] [RFC v6 0/2] monitor: add memory search commands s, sp
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Claudio Fontana <hw.claudio@gmail.com>, Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>, Claudio Fontana <claudio.fontana@huawei.com>, QEMU Developers <qemu-devel@nongnu.org>, Luiz Capitulino <lcapitulino@redhat.com>, Gonglei <arei.gonglei@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--W5UPxuLHTbujvOmH9j3HP3QRT2LPHGxsW
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

On 06/12/2015 07:31 AM, Claudio Fontana wrote:
> Hello Markus,
>=20
> the merge conflict resolution is the following:
>=20

>=20
> Or do you want me to respin based on an uncommited state of master +
> "remove ENV_GET_CPU" series?

Probably easiest to just post a v7 with RFC dropped and all resolution
performed.

--=20
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


--W5UPxuLHTbujvOmH9j3HP3QRT2LPHGxsW
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
Comment: Public key at http://people.redhat.com/eblake/eblake.gpg
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBCAAGBQJVe12kAAoJEKeha0olJ0NqeLwIAJrDYpeq0OYnrLX82e/E8pO/
OKuRzrcPwLGDiAl3OJZdQ9Dzb+bBTBn3qTloTiKHmPFalJNjaM+lsNAmSaQ4Z0W7
ZUHaDE9hZFRO1XQKZ6wixtrev+tpknHrc3p8KHAB6fCq8xjtphSlrkd74ReC53gX
G9LVVwN7iJ9DOrly65CHnTIh9QYI802lCuchSrs4HxLy2c/5rLKtOjYhH2lelce+
WJxqQEGORupEU4Jxx8d7sBo5CvtA4x4XberfHq/Ib6k9u8D5odmk9wu1jnIC0QN2
GV+Y7NfVRNKdvs4MUKAHdbLstq468JXKMam/cpMwyZkGwUGD7PACdFI6y9bDJ8g=
=Qp/8
-----END PGP SIGNATURE-----

--W5UPxuLHTbujvOmH9j3HP3QRT2LPHGxsW--