fvdl
Sat Feb 28 18:56:16 PST 1998
Update of /ccd0/cvsroot/src/sys
In directory nb00:/home/fvdl/cil/post-lite2/src/sys

Log Message:
Import some files that were changed after Lite2

Status:

Vendor Tag:	CSRG
Release Tags:	post-lite-2
		
C src/sys/kern/vfs_syscalls.c
C src/sys/kern/vnode_if.src
C src/sys/miscfs/specfs/spec_vnops.c
C src/sys/miscfs/union/union_vnops.c
C src/sys/net/if_ethersubr.c
C src/sys/net/radix.c
C src/sys/net/rtsock.c
C src/sys/vm/vm_meter.c
C src/sys/ufs/ufs/ufs_vnops.c
C src/sys/ufs/ufs/ufs_bmap.c
C src/sys/ufs/ffs/ffs_alloc.c
C src/sys/nfs/nfs_vnops.c
C src/sys/nfs/nfs_serv.c

13 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jCSRG:yesterday -jCSRG src/sys