qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@gmail.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>,
	Hani Benhabiles <kroosec@gmail.com>, Fam Zheng <famz@redhat.com>,
	qemu-devel <qemu-devel@nongnu.org>,
	Stefan Hajnoczi <stefanha@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 3/3] block/qapi: Give some functions internal linkage
Date: Fri, 13 Jun 2014 21:15:08 +0800	[thread overview]
Message-ID: <CAJSP0QVzJNoMdUO07iiFPM_rBHYrwe20dt=YiM2ru7+1dRSBKA@mail.gmail.com> (raw)
In-Reply-To: <1402059060-17544-4-git-send-email-armbru@redhat.com>

On Fri, Jun 6, 2014 at 8:51 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>  block/qapi.c         | 13 ++++++-------
>  include/block/qapi.h |  7 -------
>  2 files changed, 6 insertions(+), 14 deletions(-)

Unfortunately I had to drop this patch because it conflicts with the
following qemu.git commit which was recently merged:

commit b21631f3b5cdecd14114034cd9e4e7f63ed7fde1
Author: Hani Benhabiles <kroosec@gmail.com>
Date:   Tue May 27 23:39:37 2014 +0100

    monitor: Add delvm and loadvm argument completion

    Signed-off-by: Hani Benhabiles <hani@linux.com>
    Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>

If you want to send an updated patch, please rebase qemu.git.  I have
kept the other patches in this series.

  parent reply	other threads:[~2014-06-13 13:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-06 12:50 [Qemu-devel] [PATCH 0/3] block: Minor cleanups Markus Armbruster
2014-06-06 12:50 ` [Qemu-devel] [PATCH 1/3] blockdev: Rename drive_init(), drive_uninit() to drive_new(), drive_del() Markus Armbruster
2014-06-06 14:05   ` Benoît Canet
2014-06-06 16:13     ` Markus Armbruster
2014-06-06 12:50 ` [Qemu-devel] [PATCH 2/3] blockdev: Remove unused DriveInfo reference count Markus Armbruster
2014-06-06 14:09   ` Benoît Canet
2014-06-06 12:51 ` [Qemu-devel] [PATCH 3/3] block/qapi: Give some functions internal linkage Markus Armbruster
2014-06-06 14:13   ` Benoît Canet
2014-06-13 13:15   ` Stefan Hajnoczi [this message]
2014-06-11 10:36 ` [Qemu-devel] [PATCH 0/3] block: Minor cleanups Stefan Hajnoczi

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='CAJSP0QVzJNoMdUO07iiFPM_rBHYrwe20dt=YiM2ru7+1dRSBKA@mail.gmail.com' \
    --to=stefanha@gmail.com \
    --cc=armbru@redhat.com \
    --cc=famz@redhat.com \
    --cc=kroosec@gmail.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).