davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7f98a44b9d
kernel-ark/arch/um/drivers
History
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
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
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
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
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
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
pcap_kern.c [PATCH] uml: fix initcall return values 2006-03-31 12:18:50 -08:00
pcap_user.c
pcap_user.h
port_kern.c
port_user.c [PATCH] uml console channels: remove console_write wrappers 2005-11-13 18:14:14 -08:00
port.h
pty.c [PATCH] uml console channels: remove console_write wrappers 2005-11-13 18:14:14 -08:00
random.c
slip_common.c
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
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 [PATCH] uml: some harmless sparse warning fixes 2006-02-01 08:53:23 -08:00
ssl.h
stderr_console.c
stdio_console.c [PATCH] uml: Add throttling to console driver 2006-01-06 08:33:46 -08:00
stdio_console.h
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
xterm_kern.c
xterm.c [PATCH] uml console channels: remove console_write wrappers 2005-11-13 18:14:14 -08:00
xterm.h