From owner-cvs-sys Mon Mar 11 11:20:19 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id LAA05288 for cvs-sys-outgoing; Mon, 11 Mar 1996 11:20:19 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id LAA05263 Mon, 11 Mar 1996 11:20:11 -0800 (PST) Date: Mon, 11 Mar 1996 11:20:11 -0800 (PST) From: Peter Wemm Message-Id: <199603111920.LAA05263@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 Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/03/11 11:20:11 src/sys/isofs - Imported sources Update of /home/ncvs/src/sys/isofs In directory freefall.freebsd.org:/tmp/cvs-serv5009 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. [note, new file: cd9660_mount.h] Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 C src/sys/isofs/cd9660/cd9660_bmap.c C src/sys/isofs/cd9660/cd9660_lookup.c N src/sys/isofs/cd9660/cd9660_mount.h C src/sys/isofs/cd9660/cd9660_node.c C src/sys/isofs/cd9660/cd9660_node.h C src/sys/isofs/cd9660/cd9660_rrip.c C src/sys/isofs/cd9660/cd9660_rrip.h C src/sys/isofs/cd9660/cd9660_util.c C src/sys/isofs/cd9660/cd9660_vfsops.c C src/sys/isofs/cd9660/cd9660_vnops.c C src/sys/isofs/cd9660/iso.h U src/sys/isofs/cd9660/iso_rrip.h C src/sys/isofs/cd9660/TODO U src/sys/isofs/cd9660/TODO.hibler 11 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sys/isofs