Commit b15fb6b1 authored May 01, 2006 by Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds May 01, 2006

[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: 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>

parent 2ace87b9

arch/um/drivers/cow_user.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message