CVS commit: src/external/cddl/osnet/dist

[Adam Hamsik <haad%netbsd.org@localhost>]

Module Name:    src
Committed By:   haad
Date:           Sat Feb 27 22:33:14 UTC 2010

Update of /cvsroot/src/external/cddl/osnet/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23407

Log Message:
Import new Opensolaris sources for zfs/dtrace. 

Opensolaris mercurial changeset: 11751:58c0c8f4305f


Status:

Vendor Tag:     sun
Release Tags:   osnet-20100224
                
U src/external/cddl/osnet/dist/cmd/zfs/zfs_iter.h
U src/external/cddl/osnet/dist/cmd/zfs/zfs_util.h
U src/external/cddl/osnet/dist/cmd/zfs/zfs_iter.c
C src/external/cddl/osnet/dist/cmd/zfs/zfs_main.c
U src/external/cddl/osnet/dist/cmd/zpool/zpool_util.h
U src/external/cddl/osnet/dist/cmd/zpool/zpool_iter.c
U src/external/cddl/osnet/dist/cmd/zpool/zpool_main.c
U src/external/cddl/osnet/dist/cmd/zpool/zpool_util.c
C src/external/cddl/osnet/dist/cmd/zpool/zpool_vdev.c
U src/external/cddl/osnet/dist/cmd/dtrace/dtrace.c
U src/external/cddl/osnet/dist/cmd/zdb/zdb_il.c
U src/external/cddl/osnet/dist/cmd/zdb/zdb.c
C src/external/cddl/osnet/dist/cmd/ztest/ztest.c
U src/external/cddl/osnet/dist/common/acl/acl_common.h
U src/external/cddl/osnet/dist/common/acl/acl_common.c
U src/external/cddl/osnet/dist/common/ctf/ctf_impl.h
U src/external/cddl/osnet/dist/common/ctf/ctf_create.c
U src/external/cddl/osnet/dist/common/ctf/ctf_decl.c
U src/external/cddl/osnet/dist/common/ctf/ctf_error.c
U src/external/cddl/osnet/dist/common/ctf/ctf_hash.c
U src/external/cddl/osnet/dist/common/ctf/ctf_labels.c
U src/external/cddl/osnet/dist/common/ctf/ctf_lookup.c
U src/external/cddl/osnet/dist/common/ctf/ctf_open.c
U src/external/cddl/osnet/dist/common/ctf/ctf_types.c
U src/external/cddl/osnet/dist/common/ctf/ctf_util.c
U src/external/cddl/osnet/dist/common/zfs/zfs_comutil.h
U src/external/cddl/osnet/dist/common/zfs/zfs_deleg.h
U src/external/cddl/osnet/dist/common/zfs/zfs_namecheck.h
U src/external/cddl/osnet/dist/common/zfs/zfs_prop.h
N src/external/cddl/osnet/dist/common/zfs/zfs_fletcher.h
N src/external/cddl/osnet/dist/common/zfs/zfs_fletcher.c
U src/external/cddl/osnet/dist/common/zfs/zfs_comutil.c
U src/external/cddl/osnet/dist/common/zfs/zfs_deleg.c
U src/external/cddl/osnet/dist/common/zfs/zfs_namecheck.c
U src/external/cddl/osnet/dist/common/zfs/zfs_prop.c
U src/external/cddl/osnet/dist/common/zfs/zpool_prop.c
U src/external/cddl/osnet/dist/common/zfs/zprop_common.c
U src/external/cddl/osnet/dist/common/avl/avl.c
U src/external/cddl/osnet/dist/common/nvpair/nvpair.c
U src/external/cddl/osnet/dist/common/nvpair/nvpair_alloc_fixed.c
U src/external/cddl/osnet/dist/common/unicode/u8_textprep.c
U src/external/cddl/osnet/dist/head/storclass.h
U src/external/cddl/osnet/dist/head/nlist.h
U src/external/cddl/osnet/dist/head/note.h
U src/external/cddl/osnet/dist/head/syms.h
U src/external/cddl/osnet/dist/head/ucred.h
U src/external/cddl/osnet/dist/lib/libctf/common/ctf_lib.c
U src/external/cddl/osnet/dist/lib/libctf/common/libctf.h
U src/external/cddl/osnet/dist/lib/libctf/common/ctf_subr.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_decl.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_buf.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_errtags.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dof.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_provider.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_ident.h
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_inttab.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_list.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pcb.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_program.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_regset.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_string.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_strtab.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_xlator.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dtrace.h
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_as.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/drti.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_consume.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_buf.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_cc.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_cg.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_provider.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_decl.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dis.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_dof.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_error.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_handle.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_ident.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_inttab.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_link.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_list.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_map.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_options.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_parser.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pcb.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pid.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_pragma.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_printf.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_proc.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_program.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_regset.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_string.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_strtab.c
C src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_work.c
U src/external/cddl/osnet/dist/lib/libdtrace/common/dt_xlator.c
U src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.h
U src/external/cddl/osnet/dist/lib/libnvpair/libnvpair.c
U src/external/cddl/osnet/dist/lib/libnvpair/nvpair_alloc_system.c
U src/external/cddl/osnet/dist/lib/libshare/common/libshare.h
U src/external/cddl/osnet/dist/lib/libuutil/common/libuutil_common.h
U src/external/cddl/osnet/dist/lib/libuutil/common/libuutil.h
U src/external/cddl/osnet/dist/lib/libuutil/common/libuutil_impl.h
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_alloc.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_avl.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_dprintf.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_ident.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_list.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_misc.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_open.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_pname.c
U src/external/cddl/osnet/dist/lib/libuutil/common/uu_strtoint.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_impl.h
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs.h
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_changelist.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_config.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_dataset.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_graph.c
C src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_import.c
C src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_mount.c
C src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_pool.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_sendrecv.c
U src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_status.c
C src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_util.c
N src/external/cddl/osnet/dist/lib/libzfs/common/libzfs_fru.c
U src/external/cddl/osnet/dist/lib/libefi/common/crc32_efi.c
U src/external/cddl/osnet/dist/lib/libgen/common/gmatch.c
U src/external/cddl/osnet/dist/lib/libzpool/common/taskq.c
U src/external/cddl/osnet/dist/lib/libzpool/common/util.c
U src/external/cddl/osnet/dist/tools/ctf/common/ctf_headers.h
U src/external/cddl/osnet/dist/tools/ctf/common/list.h
U src/external/cddl/osnet/dist/tools/ctf/common/memory.h
U src/external/cddl/osnet/dist/tools/ctf/common/symbol.h
U src/external/cddl/osnet/dist/tools/ctf/common/utils.h
U src/external/cddl/osnet/dist/tools/ctf/common/list.c
U src/external/cddl/osnet/dist/tools/ctf/common/memory.c
U src/external/cddl/osnet/dist/tools/ctf/common/symbol.c
U src/external/cddl/osnet/dist/tools/ctf/common/utils.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/alist.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/fixup_tdescs.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/ctftools.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/fifo.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/hash.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/stack.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/strtab.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.h
U src/external/cddl/osnet/dist/tools/ctf/cvt/alist.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/barrier.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/compare.c
C src/external/cddl/osnet/dist/tools/ctf/cvt/ctf.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/ctfconvert.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/ctfmerge.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/dwarf.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/fifo.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/st_parse.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/hash.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/iidesc.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/input.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/merge.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/output.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/traverse.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/stabs.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/stack.c
C src/external/cddl/osnet/dist/tools/ctf/cvt/tdata.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/strtab.c
U src/external/cddl/osnet/dist/tools/ctf/cvt/util.c
U src/external/cddl/osnet/dist/tools/ctf/dump/dump.c
U src/external/cddl/osnet/dist/uts/common/fs/gfs.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_send.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/bplist.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_object.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dbuf.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_traverse.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_objset.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_zfetch.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dmu_tx.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode_sync.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dnode.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dataset.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_deleg.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_dir.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_pool.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_prop.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_scrub.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/dsl_synctask.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/gzip.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/lzjb.c
N src/external/cddl/osnet/dist/uts/common/fs/zfs/ddt_zap.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/metaslab.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/refcount.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/rrwlock.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sha256.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/spa.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_config.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_errlog.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_mirror.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/space_map.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/txg.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/uberblock.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/unique.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_cache.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_disk.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_file.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_label.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_missing.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_queue.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_raidz.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev_root.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zap.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zap_leaf.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zil.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zap_micro.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_acl.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_byteswap.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ctldir.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_dir.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fm.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_fuid.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_log.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_replay.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vfsops.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_znode.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zio.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zio_checksum.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zio_compress.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/zio_inject.c
C src/external/cddl/osnet/dist/uts/common/fs/zfs/zvol.c
N src/external/cddl/osnet/dist/uts/common/fs/zfs/ddt.c
N src/external/cddl/osnet/dist/uts/common/fs/zfs/zle.c
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/bplist.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/arc.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_objset.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dbuf.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_traverse.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_tx.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dmu_zfetch.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dnode.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dataset.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_deleg.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_dir.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_pool.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_prop.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/dsl_synctask.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/metaslab.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/metaslab_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/refcount.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/rrwlock.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_boot.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/spa_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/space_map.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/txg.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/txg_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/uberblock.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/uberblock_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/unique.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_disk.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_file.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/vdev_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zap_leaf.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_acl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_context.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ctldir.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_debug.h
C src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_dir.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_fuid.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_ioctl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_rlock.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_vfsops.h
C src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zfs_znode.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zil.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zil_impl.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_checksum.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_compress.h
U src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zio_impl.h
C src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/zvol.h
N src/external/cddl/osnet/dist/uts/common/fs/zfs/sys/ddt.h
U src/external/cddl/osnet/dist/uts/common/rpc/xdr_array.c
U src/external/cddl/osnet/dist/uts/common/rpc/types.h
U src/external/cddl/osnet/dist/uts/common/rpc/xdr.h
U src/external/cddl/osnet/dist/uts/common/rpc/xdr.c
U src/external/cddl/osnet/dist/uts/common/rpc/xdr_mem.c
U src/external/cddl/osnet/dist/uts/common/sys/acl_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/acl.h
U src/external/cddl/osnet/dist/uts/common/sys/avl_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/attr.h
U src/external/cddl/osnet/dist/uts/common/sys/avl.h
U src/external/cddl/osnet/dist/uts/common/sys/byteorder.h
U src/external/cddl/osnet/dist/uts/common/sys/bitmap.h
U src/external/cddl/osnet/dist/uts/common/sys/ccompile.h
U src/external/cddl/osnet/dist/uts/common/sys/callb.h
U src/external/cddl/osnet/dist/uts/common/sys/dtrace_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/cmn_err.h
U src/external/cddl/osnet/dist/uts/common/sys/compress.h
U src/external/cddl/osnet/dist/uts/common/sys/cpupart.h
U src/external/cddl/osnet/dist/uts/common/sys/cpuvar.h
U src/external/cddl/osnet/dist/uts/common/sys/crc32.h
U src/external/cddl/osnet/dist/uts/common/sys/cred.h
U src/external/cddl/osnet/dist/uts/common/sys/ctf.h
U src/external/cddl/osnet/dist/uts/common/sys/ctf_api.h
U src/external/cddl/osnet/dist/uts/common/sys/debug.h
U src/external/cddl/osnet/dist/uts/common/sys/dklabel.h
C src/external/cddl/osnet/dist/uts/common/sys/dtrace.h
U src/external/cddl/osnet/dist/uts/common/sys/fasttrap.h
U src/external/cddl/osnet/dist/uts/common/sys/errorq.h
U src/external/cddl/osnet/dist/uts/common/sys/efi_partition.h
U src/external/cddl/osnet/dist/uts/common/sys/gfs.h
U src/external/cddl/osnet/dist/uts/common/sys/u8_textprep_data.h
U src/external/cddl/osnet/dist/uts/common/sys/feature_tests.h
U src/external/cddl/osnet/dist/uts/common/sys/list.h
U src/external/cddl/osnet/dist/uts/common/sys/list_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/mntent.h
C src/external/cddl/osnet/dist/uts/common/sys/mnttab.h
U src/external/cddl/osnet/dist/uts/common/sys/note.h
U src/external/cddl/osnet/dist/uts/common/sys/nvpair.h
U src/external/cddl/osnet/dist/uts/common/sys/nvpair_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/priv.h
C src/external/cddl/osnet/dist/uts/common/sys/processor.h
U src/external/cddl/osnet/dist/uts/common/sys/sdt.h
U src/external/cddl/osnet/dist/uts/common/sys/stropts.h
U src/external/cddl/osnet/dist/uts/common/sys/synch.h
C src/external/cddl/osnet/dist/uts/common/sys/sysevent.h
U src/external/cddl/osnet/dist/uts/common/sys/systeminfo.h
U src/external/cddl/osnet/dist/uts/common/sys/taskq.h
U src/external/cddl/osnet/dist/uts/common/sys/taskq_impl.h
U src/external/cddl/osnet/dist/uts/common/sys/u8_textprep.h
U src/external/cddl/osnet/dist/uts/common/sys/vtoc.h
U src/external/cddl/osnet/dist/uts/common/sys/zmod.h
U src/external/cddl/osnet/dist/uts/common/sys/fm/protocol.h
U src/external/cddl/osnet/dist/uts/common/sys/fm/util.h
U src/external/cddl/osnet/dist/uts/common/sys/fm/fs/zfs.h
C src/external/cddl/osnet/dist/uts/common/sys/fs/zfs.h
U src/external/cddl/osnet/dist/uts/common/sys/sysevent/eventdefs.h
U src/external/cddl/osnet/dist/uts/common/sys/tsol/label.h
U src/external/cddl/osnet/dist/uts/common/zmod/deflate.h
U src/external/cddl/osnet/dist/uts/common/zmod/crc32.h
U src/external/cddl/osnet/dist/uts/common/zmod/inffast.h
U src/external/cddl/osnet/dist/uts/common/zmod/inffixed.h
U src/external/cddl/osnet/dist/uts/common/zmod/inflate.h
U src/external/cddl/osnet/dist/uts/common/zmod/inftrees.h
U src/external/cddl/osnet/dist/uts/common/zmod/zconf.h
U src/external/cddl/osnet/dist/uts/common/zmod/zlib.h
U src/external/cddl/osnet/dist/uts/common/zmod/zutil.h
U src/external/cddl/osnet/dist/uts/common/zmod/adler32.c
U src/external/cddl/osnet/dist/uts/common/zmod/crc32.c
U src/external/cddl/osnet/dist/uts/common/zmod/deflate.c
U src/external/cddl/osnet/dist/uts/common/zmod/inffast.c
U src/external/cddl/osnet/dist/uts/common/zmod/inflate.c
U src/external/cddl/osnet/dist/uts/common/zmod/inftrees.c
U src/external/cddl/osnet/dist/uts/common/zmod/trees.c
U src/external/cddl/osnet/dist/uts/common/zmod/zlib_lint.c
U src/external/cddl/osnet/dist/uts/common/zmod/zmod.c
U src/external/cddl/osnet/dist/uts/common/zmod/zmod_subr.c
U src/external/cddl/osnet/dist/uts/common/zmod/zutil.c
U src/external/cddl/osnet/dist/uts/common/ctf/ctf_mod.c
U src/external/cddl/osnet/dist/uts/common/ctf/ctf_subr.c
C src/external/cddl/osnet/dist/uts/common/dtrace/fasttrap.c
C src/external/cddl/osnet/dist/uts/common/dtrace/dtrace.c
C src/external/cddl/osnet/dist/uts/common/dtrace/lockstat.c
C src/external/cddl/osnet/dist/uts/common/dtrace/profile.c
C src/external/cddl/osnet/dist/uts/common/dtrace/sdt_subr.c
C src/external/cddl/osnet/dist/uts/common/dtrace/systrace.c
U src/external/cddl/osnet/dist/uts/common/os/list.c
U src/external/cddl/osnet/dist/uts/common/os/nvpair_alloc_system.c
U src/external/cddl/osnet/dist/uts/intel/sys/fasttrap_isa.h
U src/external/cddl/osnet/dist/uts/sparc/sys/fasttrap_isa.h

59 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jsun:yesterday -jsun src/external/cddl/osnet/dist