From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v7 0/4] Inter-VM shared memory device
Date: Mon, 26 Jul 2010 23:20:27 +0300
Message-ID: <4C4DEE0B.7080309@redhat.com>
References: <1276633426-30995-1-git-send-email-cam@cs.ualberta.ca>	<4C4D922C.3020608@codemonkey.ws>	<AANLkTi=fGngVkktjrULceOGqXr_goWtLt5AD=oagjm_3@mail.gmail.com>	<4C4DE75E.50507@redhat.com>	<AANLkTinrrSwSzmmyr+LRdkQk1qskCFogMSb8LoqEWK05@mail.gmail.com>	<4C4DEBDA.1030008@redhat.com> <AANLkTim7r_E=yLb9Pa_BvvvyaB1ntZwC+hUmRfjy5GJL@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org,
	kvm@vger.kernel.org, Marcelo Tosatti <mtosatti@redhat.com>
To: Cam Macdonell <cam@cs.ualberta.ca>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:21121 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751762Ab0GZUUe (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 26 Jul 2010 16:20:34 -0400
In-Reply-To: <AANLkTim7r_E=yLb9Pa_BvvvyaB1ntZwC+hUmRfjy5GJL@mail.gmail.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

  On 07/26/2010 11:16 PM, Cam Macdonell wrote:
>
>>
>>> Marcelo's version is commit c15414b9 in qemu-kvm.git
>> That appears to be a merge.
> Ah, the header changed in a merge, the original patch is commit
> 00d53f24.  I'll pick it as part of my patch set as you suggest.

Don't pick the patch, copy the code, or you'll lose accumulated updates.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.