From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [10.3.1.93] (helo=sc8-sf-list1-new.sourceforge.net) by sc8-sf-list1.sourceforge.net with esmtp (Exim 4.30) id 1FaCkM-0001e3-5F for user-mode-linux-devel@lists.sourceforge.net; Sun, 30 Apr 2006 07:18:02 -0700 Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1FaCkL-0001yf-Vy for user-mode-linux-devel@lists.sourceforge.net; Sun, 30 Apr 2006 07:18:02 -0700 Received: from host199-105.pool8255.interbusiness.it ([82.55.105.199] helo=zion.home.lan) by mail.sourceforge.net with esmtp (Exim 4.44) id 1FaCkL-0005Z4-89 for user-mode-linux-devel@lists.sourceforge.net; Sun, 30 Apr 2006 07:18:01 -0700 From: "Paolo 'Blaisorblade' Giarrusso" Message-Id: <20060430141609.9060.17002.stgit@zion.home.lan> In-Reply-To: <20060430141512.9060.39338.stgit@zion.home.lan> References: <20060430141512.9060.39338.stgit@zion.home.lan> Subject: [uml-devel] [PATCH 1/7] uml: fix patch mismerge Sender: user-mode-linux-devel-admin@lists.sourceforge.net Errors-To: user-mode-linux-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Id: The user-mode Linux development list List-Post: List-Help: List-Subscribe: , List-Archive: Date: Sun, 30 Apr 2006 16:16:09 +0200 To: Andrew Morton Cc: Jeff Dike , linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net From: Paolo 'Blaisorblade' Giarrusso I sent a patch, it was applied as cda402b283c34a24b091f78eee116963e9494762, then it was applied again as 181ae4005d0a4010802be534d929b38c42b9ac06 by mistake. But while the 1st time it modified (correctly) cow_header_v3, the 2nd it modified cow_header_v3_broken. Signed-off-by: Paolo 'Blaisorblade' Giarrusso --- arch/um/drivers/cow_user.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/um/drivers/cow_user.c b/arch/um/drivers/cow_user.c index 6ab852b..0ec4052 100644 --- a/arch/um/drivers/cow_user.c +++ b/arch/um/drivers/cow_user.c @@ -100,7 +100,7 @@ struct cow_header_v3_broken { __u32 alignment; __u32 cow_format; char backing_file[PATH_LEN_V3]; -} __attribute__((packed)); +}; /* COW format definitions - for now, we have only the usual COW bitmap */ #define COW_BITMAP 0 ------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel