All of lore.kernel.org
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Hollis Blanchard <hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: kvm-devel <kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	kvm-ppc <kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [PATCH] avoid kvm-userspace merge conflict with PowerPC KVM	support
Date: Wed, 17 Dec 2008 09:49:02 +0000	[thread overview]
Message-ID: <4948CB0E.3020204@redhat.com> (raw)
In-Reply-To: <1229470067.19354.5.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>

Hollis Blanchard wrote:
> PowerPC KVM support was accepted into upstream qemu. To ease the merge
> conflicts, you should apply this patch to remove all traces of PowerPC
> KVM code from kvm-userspace before the next qemu pull.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: Hollis Blanchard <hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
Cc: kvm-devel <kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
	kvm-ppc <kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [PATCH] avoid kvm-userspace merge conflict with PowerPC KVM	support in qemu
Date: Wed, 17 Dec 2008 11:49:02 +0200	[thread overview]
Message-ID: <4948CB0E.3020204@redhat.com> (raw)
In-Reply-To: <1229470067.19354.5.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>

Hollis Blanchard wrote:
> PowerPC KVM support was accepted into upstream qemu. To ease the merge
> conflicts, you should apply this patch to remove all traces of PowerPC
> KVM code from kvm-userspace before the next qemu pull.
>
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2008-12-17  9:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-16 23:27 [PATCH] avoid kvm-userspace merge conflict with PowerPC KVM Hollis Blanchard
2008-12-16 23:27 ` [PATCH] avoid kvm-userspace merge conflict with PowerPC KVM support in qemu Hollis Blanchard
     [not found] ` <1229470067.19354.5.camel-bi+AKbBUZKY6gyzm1THtWbp2dZbC/Bob@public.gmane.org>
2008-12-17  9:49   ` Avi Kivity [this message]
2008-12-17  9:49     ` Avi Kivity

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=4948CB0E.3020204@redhat.com \
    --to=avi@redhat.com \
    --cc=hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
    --cc=kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.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.