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

[PATCH] uml: some harmless sparse warning fixes

2006-02-01 08:53:23 -08:00

chan_user.c

[PATCH] uml: close TUN/TAP file descriptors

2006-02-07 16:12:32 -08:00

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

[PATCH] uml: fix initcall return values

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

daemon_user.c

[PATCH] uml: make daemon transport behave properly

2006-01-18 19:20:20 -08:00

daemon.h

Linux-2.6.12-rc2

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

fd.c

[PATCH] uml: move libc-dependent utility procedures

2006-01-18 19:20:19 -08:00

harddog_kern.c

[PATCH] uml: sparse cleanups

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

harddog_user.c

[PATCH] uml: separate libc-dependent helper code

2005-11-07 07:53:31 -08:00

hostaudio_kern.c

[PATCH] uml: sparse cleanups

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

line.c

[PATCH] uml: some harmless sparse warning fixes

2006-02-01 08:53:23 -08:00

Makefile

[PATCH] uml: revert block driver use of host AIO

2005-10-12 08:22:26 -07:00

mcast_kern.c

[PATCH] uml: fix initcall return values

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

mcast_user.c

[PATCH] uml: fix mcast network driver error handling

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

mcast.h

Linux-2.6.12-rc2

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

mconsole_kern.c

[PATCH] uml: local_irq_save, not local_save_flags

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

mconsole_user.c

[PATCH] uml: add mconsole_reply variant with length param

2006-01-06 08:33:47 -08:00

mmapper_kern.c

[PATCH] mmaper_kern.c fixes [buffer overruns]

2005-08-27 10:11:40 -07:00

net_kern.c

[PATCH] uml: balance list_add and list_del in the network driver

2006-02-07 16:12:32 -08:00

net_user.c

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

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

null.c

Linux-2.6.12-rc2

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

pcap_kern.c

[PATCH] uml: fix initcall return values

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

pcap_user.c

Linux-2.6.12-rc2

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

pcap_user.h

Linux-2.6.12-rc2

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

port_kern.c

[PATCH] useless linux/irq.h includes (arch/um)

2005-09-30 08:42:24 -07:00

port_user.c

[PATCH] uml console channels: remove console_write wrappers

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

port.h

Linux-2.6.12-rc2

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

pty.c

[PATCH] uml console channels: remove console_write wrappers

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

random.c

[PATCH] um: fix-up schedule_timeout() usage

2005-11-07 07:53:56 -08:00

slip_common.c

[PATCH] uml: slirp and slip driver cleanups and fixes

2005-06-13 20:58:43 -07:00

slip_common.h

[PATCH] uml: fix hugest stack users

2006-02-01 08:53:22 -08:00

slip_kern.c

[PATCH] uml: fix initcall return values

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

slip_user.c

[PATCH] uml: separate libc-dependent helper code

2005-11-07 07:53:31 -08:00

slip.h

[PATCH] uml: slirp and slip driver cleanups and fixes

2005-06-13 20:58:43 -07:00

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

[PATCH] uml: slirp and slip driver cleanups and fixes

2005-06-13 20:58:43 -07:00

ssl.c

[PATCH] uml: some harmless sparse warning fixes

2006-02-01 08:53:23 -08:00

ssl.h

Linux-2.6.12-rc2

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

stderr_console.c

[PATCH] uml: compile fixes for gcc 4

2005-06-08 16:21:12 -07:00

stdio_console.c

[PATCH] uml: Add throttling to console driver

2006-01-06 08:33:46 -08:00

stdio_console.h

Linux-2.6.12-rc2

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

tty.c

[PATCH] uml console channels: remove console_write wrappers

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

ubd_kern.c

[PATCH] uml: fix initcall return values

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

ubd_user.c

[PATCH] uml: revert block driver use of host AIO

2005-10-12 08:22:26 -07:00

xterm_kern.c

[PATCH] uml: add and use generic hw_controller_type->release

2005-06-21 19:07:32 -07:00

xterm.c

[PATCH] uml console channels: remove console_write wrappers

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

xterm.h

Linux-2.6.12-rc2

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