Paolo 'Blaisorblade' Giarrusso b15fb6b157 [PATCH] uml: fix patch mismerge ...

I sent a patch, it was applied as cda402b283,
then it was applied again as 181ae4005d 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

..

chan_kern.c

…

chan_user.c

…

cow_sys.h

[PATCH] uml: avoid warnings for diffent names for an unsigned quadword

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

cow_user.c

[PATCH] uml: fix patch mismerge

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

cow.h

[PATCH] uml: avoid warnings for diffent names for an unsigned quadword

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

daemon_kern.c

…

daemon_user.c

…

daemon.h

…

fd.c

…

harddog_kern.c

[PATCH] uml: sparse cleanups

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

harddog_user.c

…

hostaudio_kern.c

[PATCH] uml: sparse cleanups

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

line.c

…

Makefile

…

mcast_kern.c

…

mcast_user.c

…

mcast.h

…

mconsole_kern.c

[PATCH] uml: local_irq_save, not local_save_flags

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

mconsole_user.c

…

mmapper_kern.c

…

net_kern.c

…

net_user.c

[PATCH] uml: fix hang on run_helper() failure on uml_net

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

null.c

…

pcap_kern.c

…

pcap_user.c

…

pcap_user.h

…

port_kern.c

…

port_user.c

…

port.h

…

pty.c

…

random.c

…

slip_common.c

…

slip_common.h

…

slip_kern.c

…

slip_user.c

…

slip.h

…

slirp_kern.c

[PATCH] uml: sparse cleanups

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

slirp_user.c

[PATCH] uml: fix format errors

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

slirp.h

…

ssl.c

…

ssl.h

…

stderr_console.c

…

stdio_console.c

…

stdio_console.h

…

tty.c

…

ubd_kern.c

…

ubd_user.c

…

xterm_kern.c

…

xterm.c

…

xterm.h

…