Module Name: src
Committed By: hannken
Date: Wed Jun 26 11:47:55 UTC 2019
Update of /cvsroot/src/external/cddl/osnet/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv8829
Log Message:
import new CDDL dtrace and ZFS code from FreeBSD svn r315983
Add files missing from the initial import.
Status:
Vendor Tag: FreeBSD
Release Tags: CDDL-FreeBSD-r315983
C src/external/cddl/osnet/dist/OPENSOLARIS.LICENSE
C src/external/cddl/osnet/dist/cmd/zdb/zdb.8
C src/external/cddl/osnet/dist/cmd/zfs/zfs.8
C src/external/cddl/osnet/dist/cmd/zpool/zpool-features.7
C src/external/cddl/osnet/dist/cmd/zpool/zpool.8
C src/external/cddl/osnet/dist/head/libintl.h
C src/external/cddl/osnet/dist/head/stdio_ext.h
C src/external/cddl/osnet/dist/head/thread.h
N src/external/cddl/osnet/dist/head/atomic.h
N src/external/cddl/osnet/dist/head/synch.h
C src/external/cddl/osnet/dist/lib/libzpool/common/sys/zfs_context.h
C src/external/cddl/osnet/dist/uts/common/Makefile.files
C src/external/cddl/osnet/dist/uts/common/os/fm.c
C src/external/cddl/osnet/dist/uts/common/os/callb.c
C src/external/cddl/osnet/dist/uts/common/sys/vnode.h
C src/external/cddl/osnet/dist/uts/common/sys/sysmacros.h
C src/external/cddl/osnet/dist/uts/common/sys/procset.h
C src/external/cddl/osnet/dist/uts/common/sys/extdirent.h
C src/external/cddl/osnet/dist/uts/common/sys/isa_defs.h
N src/external/cddl/osnet/dist/uts/common/sys/asm_linkage.h
17 conflicts created by this import.
Use the following command to help the merge:
cvs checkout -jFreeBSD:yesterday -jFreeBSD src/external/cddl/osnet/dist
