From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55964 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OdUA8-0004k1-0o for qemu-devel@nongnu.org; Mon, 26 Jul 2010 16:20:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OdUA6-00008v-Ns for qemu-devel@nongnu.org; Mon, 26 Jul 2010 16:20:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:27706) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OdUA6-00008n-Dx for qemu-devel@nongnu.org; Mon, 26 Jul 2010 16:20:34 -0400 Message-ID: <4C4DEE0B.7080309@redhat.com> Date: Mon, 26 Jul 2010 23:20:27 +0300 From: Avi Kivity MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH v7 0/4] Inter-VM shared memory device References: <1276633426-30995-1-git-send-email-cam@cs.ualberta.ca> <4C4D922C.3020608@codemonkey.ws> <4C4DE75E.50507@redhat.com> <4C4DEBDA.1030008@redhat.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cam Macdonell Cc: Marcelo Tosatti , qemu-devel@nongnu.org, 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.