[PATCH] uml: fix patch mismerge
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Mon, 1 May 2006 19:16:01 +0000 (12:16 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 2 May 2006 01:17:44 +0000 (18:17 -0700)
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>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/um/drivers/cow_user.c

index 6ab852bfcd3ac62cb66b18a02433d6b3feaadfcb..0ec4052db9c5bbb183714a44012ef07fc388b026 100644 (file)
@@ -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