diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-05-01 15:16:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 21:17:44 -0400 |
| commit | b15fb6b157b83ce983e42130ab7d1a866020d8f5 (patch) | |
| tree | 6a90f7c7162270c8858d4555115469cd78bbf4ae /arch | |
| parent | 2ace87b9502d922397cabaf07d73e0b60c480ecf (diff) | |
[PATCH] uml: fix patch mismerge
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 6ab852bfcd3a..0ec4052db9c5 100644 --- a/arch/um/drivers/cow_user.c +++ b/arch/um/drivers/cow_user.c | |||
| @@ -100,7 +100,7 @@ struct cow_header_v3_broken { | |||
| 100 | __u32 alignment; | 100 | __u32 alignment; |
| 101 | __u32 cow_format; | 101 | __u32 cow_format; |
| 102 | char backing_file[PATH_LEN_V3]; | 102 | char backing_file[PATH_LEN_V3]; |
| 103 | } __attribute__((packed)); | 103 | }; |
| 104 | 104 | ||
| 105 | /* COW format definitions - for now, we have only the usual COW bitmap */ | 105 | /* COW format definitions - for now, we have only the usual COW bitmap */ |
| 106 | #define COW_BITMAP 0 | 106 | #define COW_BITMAP 0 |