Commit b15fb6b1 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[PATCH] uml: fix patch mismerge

I sent a patch, it was applied as cda402b2,
then it was applied again as 181ae400 by
mistake.  But while the 1st time it modified (correctly) cow_header_v3, the
2nd it modified cow_header_v3_broken.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2ace87b9
...@@ -100,7 +100,7 @@ struct cow_header_v3_broken { ...@@ -100,7 +100,7 @@ struct cow_header_v3_broken {
__u32 alignment; __u32 alignment;
__u32 cow_format; __u32 cow_format;
char backing_file[PATH_LEN_V3]; char backing_file[PATH_LEN_V3];
} __attribute__((packed)); };
/* COW format definitions - for now, we have only the usual COW bitmap */ /* COW format definitions - for now, we have only the usual COW bitmap */
#define COW_BITMAP 0 #define COW_BITMAP 0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment