Skip to content

Commit b15fb6b

Browse files
Paolo 'Blaisorblade' GiarrussoLinus Torvalds
authored andcommitted
[PATCH] uml: fix patch mismerge
I sent a patch, it was applied as cda402b, then it was applied again as 181ae40 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 <[email protected]> Acked-by: Jeff Dike <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 2ace87b commit b15fb6b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/um/drivers/cow_user.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ struct cow_header_v3_broken {
100100
__u32 alignment;
101101
__u32 cow_format;
102102
char backing_file[PATH_LEN_V3];
103-
} __attribute__((packed));
103+
};
104104

105105
/* COW format definitions - for now, we have only the usual COW bitmap */
106106
#define COW_BITMAP 0

0 commit comments

Comments
 (0)