From owner-cvs-sys  Mon Mar 11 11:34:21 1996
Return-Path: owner-cvs-sys
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA06759
          for cvs-sys-outgoing; Mon, 11 Mar 1996 11:34:21 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id LAA06742
          Mon, 11 Mar 1996 11:34:15 -0800 (PST)
Date: Mon, 11 Mar 1996 11:34:15 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199603111934.LAA06742@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-sys
Subject: cvs commit:  src/sys/conf - Imported sources src/sys/isofs - Imported sources src/sys/dev - Imported sources src/sys/libkern - Imported sources src/sys/miscfs - Imported sources src/sys/nfs - Imported sources
Sender: owner-cvs-sys@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/03/11 11:34:14

  src/sys/nfs - Imported sources
  Update of /home/ncvs/src/sys/nfs
  In directory freefall.freebsd.org:/tmp/cvs-serv6495
  
  Revision/Branch: 1.1.1
  
  Log Message:
  Import 4.4BSD-Lite2 onto the vendor branch, note that in the kernel, all
  files are off the vendor branch, so this should not change anything.
  
  A "U" marker generally means that the file was not changed in between
  the 4.4Lite and Lite-2 releases, and does not need a merge.  "C" generally
  means that there was a change.
  
  Status:
  
  Vendor Tag:	CSRG
  Release Tags:	bsd_44_lite_2
  		
  C src/sys/nfs/nfs.h
  C src/sys/nfs/nfsdiskless.h
  C src/sys/nfs/nfsmount.h
  C src/sys/nfs/nfsm_subs.h
  C src/sys/nfs/nfsnode.h
  C src/sys/nfs/nfsproto.h
  C src/sys/nfs/nfsrtt.h
  C src/sys/nfs/nfsrvcache.h
  C src/sys/nfs/nfs_bio.c
  C src/sys/nfs/nfs_node.c
  C src/sys/nfs/nfs_nqlease.c
  C src/sys/nfs/nfs_serv.c
  C src/sys/nfs/nfs_socket.c
  C src/sys/nfs/nfs_srvcache.c
  C src/sys/nfs/nfs_subs.c
  C src/sys/nfs/nfs_syscalls.c
  C src/sys/nfs/nfs_vfsops.c
  C src/sys/nfs/nfs_vnops.c
  C src/sys/nfs/nqnfs.h
  C src/sys/nfs/rpcv2.h
  C src/sys/nfs/xdr_subs.h
  
  21 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jCSRG:yesterday -jCSRG src/sys/nfs