From: Avi Kivity <avi@redhat.com>
To: Mark McLoughlin <markmc@redhat.com>
Cc: kvm <kvm@vger.kernel.org>
Subject: Re: [GIT PULL] Merge latest qemu.git
Date: Thu, 11 Jun 2009 15:29:39 +0300 [thread overview]
Message-ID: <4A30F8B3.70104@redhat.com> (raw)
In-Reply-To: <1244717573.7752.9.camel@blaa>
Mark McLoughlin wrote:
> Hi Avi,
> The conflicts with the networking changes just pushed to qemu.git are
> fairly involved to resolve, so I thought I'd try and save you the pain.
>
> Below is a pull request which merges in the latest, and does it in the
> way we recently discussed - each conflict is resolved in a separate
> merge commit.
>
> I've build tested the x86_64-softmmu target and done some light
> networking testing.
>
>
Pulled, thanks.
> HTH,
>
Very much.
--
error compiling committee.c: too many arguments to function
prev parent reply other threads:[~2009-06-11 12:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-11 10:52 [GIT PULL] Merge latest qemu.git Mark McLoughlin
2009-06-11 12:29 ` Avi Kivity [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=4A30F8B3.70104@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=markmc@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 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.