All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
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>
Subject: Re: [Qemu-devel] [RFC v6 0/2] monitor: add memory search commands s, sp
Date: Fri, 12 Jun 2015 16:31:00 -0600	[thread overview]
Message-ID: <557B5DA4.30004@redhat.com> (raw)
In-Reply-To: <CANv_3Ybc6Qme2YwKjHBwmshEyqpAejUDBjKp7kUjvtHScCOsAg@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

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

> 
> 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.

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


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

      reply	other threads:[~2015-06-12 22:31 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-18 11:22 [Qemu-devel] [RFC v6 0/2] monitor: add memory search commands s, sp hw.claudio
2015-05-18 11:22 ` [Qemu-devel] [RFC v6 1/2] util: add memmem replacement function hw.claudio
2015-05-18 14:47   ` Eric Blake
2015-05-18 11:22 ` [Qemu-devel] [RFC v6 2/2] monitor: add memory search commands s, sp hw.claudio
2015-05-28 20:18 ` [Qemu-devel] [RFC v6 0/2] " Luiz Capitulino
2015-06-11 17:53   ` Luiz Capitulino
2015-06-12  6:21     ` Markus Armbruster
2015-06-12  8:35       ` Claudio Fontana
2015-06-12 12:57         ` Markus Armbruster
2015-06-12 13:31           ` Claudio Fontana
2015-06-12 22:31             ` Eric Blake [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=557B5DA4.30004@redhat.com \
    --to=eblake@redhat.com \
    --cc=arei.gonglei@huawei.com \
    --cc=armbru@redhat.com \
    --cc=claudio.fontana@huawei.com \
    --cc=hw.claudio@gmail.com \
    --cc=lcapitulino@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.