Date: Mon, 11 Mar 1996 11:39:42 -0800 (PST) From: Peter Wemm <peter> To: CVS-committers, cvs-all, cvs-sys Subject: cvs commit: src/sys/sys - Imported sources Message-ID: <199603111939.LAA07422@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/03/11 11:39:42 src/sys/sys - Imported sources Update of /home/ncvs/src/sys/sys In directory freefall.freebsd.org:/tmp/cvs-serv6970 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. [new sys/syscallargs.h file, to be "cvs rm"ed] Status: Vendor Tag: CSRG Release Tags: bsd_44_lite_2 C src/sys/sys/vnioctl.h C src/sys/sys/acct.h C src/sys/sys/buf.h U src/sys/sys/callout.h C src/sys/sys/cdefs.h U src/sys/sys/clist.h C src/sys/sys/conf.h U src/sys/sys/device.h U src/sys/sys/dir.h C src/sys/sys/dirent.h C src/sys/sys/disk.h C src/sys/sys/disklabel.h C src/sys/sys/dkbad.h U src/sys/sys/dkstat.h U src/sys/sys/dmap.h U src/sys/sys/domain.h U src/sys/sys/errno.h C src/sys/sys/exec.h U src/sys/sys/fbio.h U src/sys/sys/fcntl.h C src/sys/sys/file.h U src/sys/sys/filedesc.h U src/sys/sys/filio.h U src/sys/sys/gmon.h C src/sys/sys/ioccom.h U src/sys/sys/ioctl.h U src/sys/sys/ioctl_compat.h C src/sys/sys/ipc.h U src/sys/sys/kernel.h C src/sys/sys/ktrace.h C src/sys/sys/malloc.h U src/sys/sys/map.h C src/sys/sys/mbuf.h C src/sys/sys/mman.h C src/sys/sys/mount.h U src/sys/sys/msgbuf.h U src/sys/sys/mtio.h C src/sys/sys/namei.h C src/sys/sys/param.h C src/sys/sys/proc.h U src/sys/sys/protosw.h U src/sys/sys/ptrace.h C src/sys/sys/queue.h C src/sys/sys/reboot.h C src/sys/sys/resourcevar.h C src/sys/sys/resource.h U src/sys/sys/select.h C src/sys/sys/signal.h C src/sys/sys/signalvar.h C src/sys/sys/socket.h C src/sys/sys/socketvar.h U src/sys/sys/sockio.h C src/sys/sys/stat.h C src/sys/sys/systm.h C src/sys/sys/time.h C src/sys/sys/syscall.h N src/sys/sys/syscallargs.h C src/sys/sys/sysctl.h U src/sys/sys/syslimits.h U src/sys/sys/syslog.h C src/sys/sys/tablet.h U src/sys/sys/termios.h U src/sys/sys/timeb.h U src/sys/sys/times.h U src/sys/sys/tprintf.h U src/sys/sys/trace.h C src/sys/sys/tty.h U src/sys/sys/ttychars.h U src/sys/sys/ttycom.h U src/sys/sys/ttydefaults.h U src/sys/sys/ttydev.h C src/sys/sys/types.h C src/sys/sys/ucred.h U src/sys/sys/uio.h C src/sys/sys/un.h U src/sys/sys/unistd.h U src/sys/sys/unpcb.h U src/sys/sys/user.h U src/sys/sys/utsname.h U src/sys/sys/vadvise.h U src/sys/sys/vcmd.h U src/sys/sys/vlimit.h C src/sys/sys/vmmeter.h C src/sys/sys/vnode.h U src/sys/sys/vsio.h C src/sys/sys/wait.h 42 conflicts created by this import. Use the following command to help the merge: cvs checkout -jCSRG:yesterday -jCSRG src/sys/sys
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199603111939.LAA07422>