darrenr 29fab67628 fix conflicts

1997-05-25 12:40:11 +00:00

..

adosfs

Fix a cut&paste (?) mistake. pr#3622

1997-05-14 19:00:17 +00:00

arch

lint: include header files with declarations of input-redirect hooks.

1997-05-25 10:53:33 +00:00

compat

GC old ultrix-emul syscall stub used to debug ultrix signals.

1997-05-25 11:09:39 +00:00

conf

Add ddb/db_xxx.c

1997-05-21 19:54:54 +00:00

ddb

Move some DDB stuff here from kern_clock.c and kern_proc.c

1997-05-21 19:54:00 +00:00

dev

lint: delete unused variables.

1997-05-25 05:48:14 +00:00

gdbscripts

…

ipkdb

…

isofs/cd9660

Fix typo.

1997-05-08 16:43:16 +00:00

kern

If the pgrp_id argument of TIOCSPGRP (a.k.a. tcsetpgrp()) does not specify

1997-05-22 17:35:42 +00:00

lib

Sync with src/lib/libz

1997-05-20 14:41:54 +00:00

lkm

copyright assigned to TNF

1997-05-19 23:26:32 +00:00

miscfs

When reading from an empty FIFO no process has opened for writing, and

1997-05-18 12:19:29 +00:00

msdosfs

NULL => 0 (Arne Juul; PR#3629)

1997-05-17 20:31:15 +00:00

net

PR/3665: Martin Husemann: if_strip calls sl_compress_init with extra arg.

1997-05-24 14:39:44 +00:00

netatalk

…

netccitt

…

netinet

fix conflicts

1997-05-25 12:40:11 +00:00

netiso

…

netnatm

…

netns

…

nfs

Temporary work-around for PR kern/3579 (from Jonathan Stone).

1997-05-22 18:20:06 +00:00

scsi

…

stand

…

sys

Add defines to be backwards compatible with 1.2 encoding names.

1997-05-24 23:23:17 +00:00

ufs

When doing a CREATE, RENAME or DELETE w/ DOWHITEOUT and ISWHITEOUT lookup on a

1997-05-12 19:04:16 +00:00

vm

Eliminate vmspace.vm_pmap and all references to it unless

1997-05-16 21:39:50 +00:00

Makefile

Install header files from miscfs.

1997-05-10 22:09:46 +00:00