From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

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 <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/um/drivers/cow_user.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/um/drivers/cow_user.c~uml-fix-patch-mismerge arch/um/drivers/cow_user.c
--- devel/arch/um/drivers/cow_user.c~uml-fix-patch-mismerge	2006-04-30 13:23:12.000000000 -0700
+++ devel-akpm/arch/um/drivers/cow_user.c	2006-04-30 13:23:12.000000000 -0700
@@ -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
_