The patch titled
uml: fix patch mismerge
has been removed from the -mm tree. Its filename is
uml-fix-patch-mismerge.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
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>
Acked-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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-05-01 12:15:31.000000000 -0700
+++ devel-akpm/arch/um/drivers/cow_user.c 2006-05-01 12:15:31.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
_
Patches currently in -mm which might be from blaisorblade@xxxxxxxx are
origin.patch
uml-make-copy__user-atomic.patch
uml-fix-not_dead_yet-when-directory-is-in-bad-state.patch
uml-rename-and-improve-actually_do_remove.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
