[PATCH 1/7] uml: fix patch mismerge
- From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
- Date: Sun, 30 Apr 2006 16:16:09 +0200
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
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@xxxxxxxx>
---
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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
- References:
- [PATCH 0/7] Uml fixes for 2.6.17
- From: Paolo 'Blaisorblade' Giarrusso
- [PATCH 0/7] Uml fixes for 2.6.17
- Prev by Date: [PATCH 7/7] uml: export symbols added by GCC hardened
- Next by Date: [PATCH 0/7] Uml fixes for 2.6.17
- Previous by thread: [PATCH 7/7] uml: export symbols added by GCC hardened
- Next by thread: [PATCH 2/7] uml: search from uml_net in a more reasonable PATH
- Index(es):
Relevant Pages
|
|
