From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGV9k-0004GA-Tc for qemu-devel@nongnu.org; Fri, 04 Dec 2009 05:12:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGV9g-0004Ac-4i for qemu-devel@nongnu.org; Fri, 04 Dec 2009 05:12:56 -0500 Received: from [199.232.76.173] (port=39913 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGV9f-0004AP-VP for qemu-devel@nongnu.org; Fri, 04 Dec 2009 05:12:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45791) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGV9f-0006EJ-Kc for qemu-devel@nongnu.org; Fri, 04 Dec 2009 05:12:51 -0500 Message-ID: <4B18E05F.6030800@redhat.com> Date: Fri, 04 Dec 2009 11:11:43 +0100 From: Kevin Wolf MIME-Version: 1.0 Subject: Re: [Qemu-devel] Patch mismerge References: <1258542921-776-1-git-send-email-kwolf@redhat.com> <4B18DC6D.1050100@redhat.com> In-Reply-To: <4B18DC6D.1050100@redhat.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org Am 04.12.2009 10:54, schrieb Kevin Wolf: > Hi Anthony, > > the description of this patch made it into commit 5f370b1, but the > content of this commit is obviously nonsense (adds only an empty line). > It's still uint32_t in current master. Can you take the patch into your > queue once again? It should still apply cleanly. Sorry, looks like you already did and it's just not pushed to master yet. Kevin