Date: Mon, 11 Mar 1996 11:47:22 -0800 (PST) From: Peter Wemm <peter> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/ufs - Imported sources src/sys/sys - Imported sources Message-ID: <199603111947.LAA08367@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/03/11 11:47:22 src/sys/ufs - Imported sources Update of /home/ncvs/src/sys/ufs In directory freefall.freebsd.org:/tmp/cvs-serv7957 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/ufs/ffs/ffs_alloc.c C src/sys/ufs/ffs/ffs_balloc.c C src/sys/ufs/ffs/ffs_extern.h C src/sys/ufs/ffs/ffs_inode.c C src/sys/ufs/ffs/ffs_subr.c U src/sys/ufs/ffs/ffs_tables.c C src/sys/ufs/ffs/ffs_vfsops.c C src/sys/ufs/ffs/ffs_vnops.c C src/sys/ufs/ffs/fs.h C src/sys/ufs/lfs/lfs.h C src/sys/ufs/lfs/lfs_alloc.c C src/sys/ufs/lfs/lfs_balloc.c C src/sys/ufs/lfs/lfs_bio.c C src/sys/ufs/lfs/lfs_cksum.c U src/sys/ufs/lfs/lfs_debug.c C src/sys/ufs/lfs/lfs_extern.h C src/sys/ufs/lfs/lfs_inode.c C src/sys/ufs/lfs/lfs_segment.c C src/sys/ufs/lfs/lfs_subr.c C src/sys/ufs/lfs/lfs_syscalls.c C src/sys/ufs/lfs/lfs_vfsops.c C src/sys/ufs/lfs/lfs_vnops.c U src/sys/ufs/lfs/README U src/sys/ufs/lfs/TODO U src/sys/ufs/mfs/mfsiom.h C src/sys/ufs/mfs/mfsnode.h C src/sys/ufs/mfs/mfs_extern.h C src/sys/ufs/mfs/mfs_vfsops.c C src/sys/ufs/mfs/mfs_vnops.c C src/sys/ufs/ufs/dinode.h C src/sys/ufs/ufs/dir.h C src/sys/ufs/ufs/inode.h C src/sys/ufs/ufs/lockf.h C src/sys/ufs/ufs/quota.h C src/sys/ufs/ufs/ufsmount.h C src/sys/ufs/ufs/ufs_bmap.c U src/sys/ufs/ufs/ufs_disksubr.c C src/sys/ufs/ufs/ufs_extern.h C src/sys/ufs/ufs/ufs_ihash.c C src/sys/ufs/ufs/ufs_inode.c C src/sys/ufs/ufs/ufs_lockf.c C src/sys/ufs/ufs/ufs_lookup.c C src/sys/ufs/ufs/ufs_quota.c C src/sys/ufs/ufs/ufs_readwrite.c C src/sys/ufs/ufs/ufs_vfsops.c C src/sys/ufs/ufs/ufs_vnops.c 40 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sys/ufs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199603111947.LAA08367>