From owner-cvs-sys Mon Mar 11 11:54:51 1996 Return-Path: owner-cvs-sys Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id LAA09617 for cvs-sys-outgoing; Mon, 11 Mar 1996 11:54:51 -0800 (PST) Received: (from peter@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id LAA09594 Mon, 11 Mar 1996 11:54:41 -0800 (PST) Date: Mon, 11 Mar 1996 11:54:41 -0800 (PST) From: Peter Wemm Message-Id: <199603111954.LAA09594@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/vm - Imported sources Sender: owner-cvs-sys@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 96/03/11 11:54:39 src/sys/vm - Imported sources Update of /home/ncvs/src/sys/vm In directory freefall.freebsd.org:/tmp/cvs-serv9140 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/vm/kern_lock.c U src/sys/vm/device_pager.c U src/sys/vm/device_pager.h U src/sys/vm/pmap.h U src/sys/vm/swap_pager.c U src/sys/vm/swap_pager.h C src/sys/vm/lock.h C src/sys/vm/vm.h C src/sys/vm/vm_extern.h C src/sys/vm/vm_fault.c C src/sys/vm/vm_glue.c U src/sys/vm/vm_inherit.h U src/sys/vm/vm_init.c C src/sys/vm/vm_kern.c U src/sys/vm/vm_kern.h C src/sys/vm/vm_map.c C src/sys/vm/vm_map.h C src/sys/vm/vm_meter.c C src/sys/vm/vm_mmap.c C src/sys/vm/vm_object.c C src/sys/vm/vm_object.h C src/sys/vm/vm_page.c C src/sys/vm/vm_page.h C src/sys/vm/vm_pageout.c C src/sys/vm/vm_pageout.h C src/sys/vm/vm_pager.c C src/sys/vm/vm_pager.h C src/sys/vm/vm_param.h U src/sys/vm/vm_prot.h U src/sys/vm/vm_swap.c C src/sys/vm/vm_unix.c U src/sys/vm/vm_user.c C src/sys/vm/vnode_pager.c U src/sys/vm/vnode_pager.h 22 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sys/vm