diff options
| author |   Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-05-01 12:16:01 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 18:17:44 -0700 |
| commit | b15fb6b157b83ce983e42130ab7d1a866020d8f5 (patch) | |
| tree | 6a90f7c7162270c8858d4555115469cd78bbf4ae /arch/um/os-Linux | |
| parent | [PATCH] uml: error handling fixes (diff) | |
| download | linux-dev-b15fb6b157b83ce983e42130ab7d1a866020d8f5.tar.xz linux-dev-b15fb6b157b83ce983e42130ab7d1a866020d8f5.zip | |
[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/um/os-Linux')
0 files changed, 0 insertions, 0 deletions