Module Name:	syssrc
Committed By:	deberg
Date:		Fri Jan  4 02:39:47 UTC 2002

Modified Files:
	syssrc/sys/netsmb: iconv.c iconv.h netbios.h smb.h smb_conn.c
	    smb_conn.h smb_crypt.c smb_dev.c smb_dev.h smb_iod.c smb_rq.c
	    smb_rq.h smb_smb.c smb_subr.c smb_subr.h smb_tran.h smb_trantcp.c
	    smb_trantcp.h smb_usr.c
Added Files:
	syssrc/sys/netsmb: mchain.h subr_mchain.c
Removed Files:
	syssrc/sys/netsmb: smb_lib.h smb_lock.c smb_lock.h smb_rap.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 syssrc/sys/netsmb/iconv.c syssrc/sys/netsmb/smb.h \
    syssrc/sys/netsmb/smb_conn.c syssrc/sys/netsmb/smb_crypt.c \
    syssrc/sys/netsmb/smb_rq.c syssrc/sys/netsmb/smb_smb.c \
    syssrc/sys/netsmb/smb_subr.c syssrc/sys/netsmb/smb_trantcp.c
cvs rdiff -r1.1 -r1.2 syssrc/sys/netsmb/iconv.h syssrc/sys/netsmb/netbios.h \
    syssrc/sys/netsmb/smb_conn.h syssrc/sys/netsmb/smb_dev.h \
    syssrc/sys/netsmb/smb_rq.h syssrc/sys/netsmb/smb_subr.h \
    syssrc/sys/netsmb/smb_tran.h syssrc/sys/netsmb/smb_trantcp.h
cvs rdiff -r0 -r1.1 syssrc/sys/netsmb/mchain.h \
    syssrc/sys/netsmb/subr_mchain.c
cvs rdiff -r1.4 -r1.5 syssrc/sys/netsmb/smb_dev.c
cvs rdiff -r1.1.1.1 -r1.2 syssrc/sys/netsmb/smb_iod.c
cvs rdiff -r1.1 -r0 syssrc/sys/netsmb/smb_lib.h syssrc/sys/netsmb/smb_lock.h \
    syssrc/sys/netsmb/smb_rap.h
cvs rdiff -r1.2 -r0 syssrc/sys/netsmb/smb_lock.c
cvs rdiff -r1.3 -r1.4 syssrc/sys/netsmb/smb_usr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.