Module Name: src Committed By: pgoyette Date: Fri Nov 18 07:49:15 UTC 2016
Update of /cvsroot/src/sys/fs/nfs In directory ivanova.netbsd.org:/tmp/cvs-serv13078 Log Message: Update to FreeBSD revision 308975 ( approx 2016-11-18 07:30 UTC) If I'm going to try to get this working, I should at least start with the most recent code available. Status: Vendor Tag: FREEBSD Release Tags: FREEBSD-308975 C src/sys/fs/nfs/nfs2netbsd.sh C src/sys/fs/nfs/files.newnfs N src/sys/fs/nfs/client/nfs_clkdtrace.c U src/sys/fs/nfs/client/nfs_clcomsubs.c U src/sys/fs/nfs/client/nfs_clsubs.c C src/sys/fs/nfs/client/nfs_clstate.c U src/sys/fs/nfs/client/nfs_clkrpc.c U src/sys/fs/nfs/client/nfs_clrpcops.c C src/sys/fs/nfs/client/nfs_clvnops.c U src/sys/fs/nfs/client/nfs_clnode.c U src/sys/fs/nfs/client/nfs_clvfsops.c U src/sys/fs/nfs/client/nfs_clport.c C src/sys/fs/nfs/client/nfs_clbio.c U src/sys/fs/nfs/client/nfs_clnfsiod.c U src/sys/fs/nfs/client/nfs.h U src/sys/fs/nfs/client/nfsmount.h U src/sys/fs/nfs/client/nfs_kdtrace.h U src/sys/fs/nfs/client/nlminfo.h U src/sys/fs/nfs/client/nfsnode.h U src/sys/fs/nfs/common/bootp_subr.c U src/sys/fs/nfs/common/krpc.h C src/sys/fs/nfs/common/krpc_subr.c U src/sys/fs/nfs/common/nfs_common.h U src/sys/fs/nfs/common/nfs_diskless.c U src/sys/fs/nfs/common/nfs_fha.c C src/sys/fs/nfs/common/nfs_fha.h U src/sys/fs/nfs/common/nfs_kdtrace.h U src/sys/fs/nfs/common/nfs_lock.c U src/sys/fs/nfs/common/nfs_lock.h U src/sys/fs/nfs/common/nfs_mountcommon.h U src/sys/fs/nfs/common/nfs_nfssvc.c U src/sys/fs/nfs/common/nfsdiskless.h U src/sys/fs/nfs/common/nfssvc.h U src/sys/fs/nfs/common/old_xdr_subs.h U src/sys/fs/nfs/common/oldnfsproto.h U src/sys/fs/nfs/common/nfs.h U src/sys/fs/nfs/common/nfs_commonacl.c U src/sys/fs/nfs/common/nfs_commonkrpc.c U src/sys/fs/nfs/common/nfs_commonport.c U src/sys/fs/nfs/common/nfs_commonsubs.c U src/sys/fs/nfs/common/nfs_var.h U src/sys/fs/nfs/common/nfscl.h U src/sys/fs/nfs/common/nfsclstate.h U src/sys/fs/nfs/common/nfsdport.h U src/sys/fs/nfs/common/nfskpiport.h C src/sys/fs/nfs/common/nfsm_subs.h U src/sys/fs/nfs/common/nfsport.h U src/sys/fs/nfs/common/nfsproto.h U src/sys/fs/nfs/common/nfsrvcache.h U src/sys/fs/nfs/common/nfsrvstate.h U src/sys/fs/nfs/common/nfsv4_errstr.h U src/sys/fs/nfs/common/rpcv2.h U src/sys/fs/nfs/common/xdr_subs.h U src/sys/fs/nfs/nlm/nlm_advlock.c U src/sys/fs/nfs/nlm/nlm_prot_clnt.c C src/sys/fs/nfs/nlm/nlm_prot_impl.c U src/sys/fs/nfs/nlm/nlm_prot_server.c U src/sys/fs/nfs/nlm/nlm_prot_svc.c U src/sys/fs/nfs/nlm/nlm_prot_xdr.c U src/sys/fs/nfs/nlm/sm_inter_xdr.c U src/sys/fs/nfs/nlm/nlm_prot.h U src/sys/fs/nfs/nlm/sm_inter.h U src/sys/fs/nfs/nlm/nlm.h U src/sys/fs/nfs/server/nfs_fha_new.c U src/sys/fs/nfs/server/nfs_nfsdsocket.c C src/sys/fs/nfs/server/nfs_nfsdsubs.c C src/sys/fs/nfs/server/nfs_nfsdstate.c C src/sys/fs/nfs/server/nfs_nfsdkrpc.c C src/sys/fs/nfs/server/nfs_nfsdserv.c U src/sys/fs/nfs/server/nfs_nfsdport.c C src/sys/fs/nfs/server/nfs_nfsdcache.c U src/sys/fs/nfs/server/nfs_fha_new.h 14 conflicts created by this import. Use the following command to help the merge: cvs checkout -jFREEBSD:yesterday -jFREEBSD src/sys/fs/nfs