Paolo 'Blaisorblade' Giarrusso b15fb6b157 [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>

2006-05-01 18:17:44 -07:00

..

drivers

[PATCH] uml: fix patch mismerge

2006-05-01 18:17:44 -07:00

include

[PATCH] uml: change sigjmp_buf to jmp_buf

2006-04-19 09:13:51 -07:00

kernel

[PATCH] uml: remove NULL checks and add some CodingStyle

2006-05-01 18:17:44 -07:00

os-Linux

[PATCH] uml: error handling fixes

2006-05-01 18:17:44 -07:00

scripts

[PATCH] uml: support sparse for userspace files

2006-04-11 06:18:36 -07:00

sys-i386

[PATCH] uml: add missing __volatile__

2006-04-19 09:13:51 -07:00

sys-ia64

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sys-ppc

[PATCH] uml: stack dump fix

2005-05-28 16:46:13 -07:00

sys-x86_64

[PATCH] uml: add missing __volatile__

2006-04-19 09:13:51 -07:00

config.release

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

defconfig

[PATCH] uml: update defconfig

2006-05-01 18:17:44 -07:00

Kconfig

[PATCH] uml: skas0 support for 2G/2G hosts

2006-05-01 18:17:43 -07:00

Kconfig.char

[PATCH] uml: Rename Kconfig files to be like the other arches

2005-09-05 00:06:19 -07:00

Kconfig.debug

[PATCH] uml: workaround GDB problems on debugging

2005-09-05 00:06:20 -07:00

Kconfig.i386

[PATCH] uml: skas0 support for 2G/2G hosts

2006-05-01 18:17:43 -07:00

Kconfig.net

[PATCH] uml: Rename Kconfig files to be like the other arches

2005-09-05 00:06:19 -07:00

Kconfig.scsi

[PATCH] uml: Rename Kconfig files to be like the other arches

2005-09-05 00:06:19 -07:00

Kconfig.x86_64

[PATCH] um: fix undefined reference to hweight32

2006-03-26 08:57:09 -08:00

Makefile

[PATCH] uml: fix parallel make early failure on clean tree

2006-04-11 06:18:37 -07:00

Makefile-i386

[PATCH] uml: fixups for "reuse i386 cpu-specific tuning"

2005-11-13 18:14:14 -08:00

Makefile-ia64

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-os-Linux

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-ppc

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-skas

[PATCH] uml makefiles sanitized

2005-09-29 08:46:26 -07:00

Makefile-tt

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

Makefile-x86_64

[PATCH] uml: eliminate symlinks to host arch

2006-03-31 12:18:50 -08:00