Module Name: src
Committed By: pgoyette
Date: Fri Nov 18 08:31:30 UTC 2016
Modified Files:
src/sys/fs/nfs: files.newnfs
src/sys/fs/nfs/client: nfs_clbio.c nfs_clstate.c nfs_clvnops.c
src/sys/fs/nfs/common: krpc_subr.c nfs_fha.h nfsm_subs.h
src/sys/fs/nfs/nlm: nlm_prot_impl.c
src/sys/fs/nfs/server: nfs_nfsdcache.c nfs_nfsdkrpc.c nfs_nfsdserv.c
nfs_nfsdstate.c nfs_nfsdsubs.c
Log Message:
Resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/nfs/files.newnfs
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/client/nfs_clbio.c \
src/sys/fs/nfs/client/nfs_clstate.c src/sys/fs/nfs/client/nfs_clvnops.c
cvs rdiff -u -r1.4 -r1.5 src/sys/fs/nfs/common/krpc_subr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/common/nfs_fha.h \
src/sys/fs/nfs/common/nfsm_subs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/nlm/nlm_prot_impl.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nfs/server/nfs_nfsdcache.c \
src/sys/fs/nfs/server/nfs_nfsdkrpc.c src/sys/fs/nfs/server/nfs_nfsdserv.c \
src/sys/fs/nfs/server/nfs_nfsdstate.c \
src/sys/fs/nfs/server/nfs_nfsdsubs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
