svn commit: r258951 - in user/ed/newcons: . bin/sh bin/test cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n cddl/contrib/opensolaris/cmd/plockstat cddl/contrib/opensolaris/cmd/zdb cdd...

Aleksandr Rybalko ray at FreeBSD.org
Thu Dec 5 00:58:01 UTC 2013


Author: ray
Date: Thu Dec  5 00:57:53 2013
New Revision: 258951
URL: http://svnweb.freebsd.org/changeset/base/258951

Log:
  MFC @r258947.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  user/ed/newcons/contrib/atf/atf-c++/detail/auto_array.hpp
     - copied unchanged from r258947, head/contrib/atf/atf-c++/detail/auto_array.hpp
  user/ed/newcons/contrib/atf/atf-c++/detail/auto_array_test.cpp
     - copied unchanged from r258947, head/contrib/atf/atf-c++/detail/auto_array_test.cpp
  user/ed/newcons/contrib/atf/atf-c++/noncopyable.hpp
     - copied unchanged from r258947, head/contrib/atf/atf-c++/noncopyable.hpp
  user/ed/newcons/contrib/atf/atf-c++/utils.cpp
     - copied unchanged from r258947, head/contrib/atf/atf-c++/utils.cpp
  user/ed/newcons/contrib/gcc/cp/ChangeLog.gcc43
     - copied unchanged from r258947, head/contrib/gcc/cp/ChangeLog.gcc43
  user/ed/newcons/contrib/gcc/tree-ssa-alias-warnings.c
     - copied unchanged from r258947, head/contrib/gcc/tree-ssa-alias-warnings.c
  user/ed/newcons/contrib/gcclibs/libcpp/ChangeLog.gcc43
     - copied unchanged from r258947, head/contrib/gcclibs/libcpp/ChangeLog.gcc43
  user/ed/newcons/contrib/gcclibs/libcpp/directives-only.c
     - copied unchanged from r258947, head/contrib/gcclibs/libcpp/directives-only.c
  user/ed/newcons/contrib/gcclibs/libiberty/ChangeLog.gcc43
     - copied unchanged from r258947, head/contrib/gcclibs/libiberty/ChangeLog.gcc43
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
     - copied unchanged from r258947, head/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
  user/ed/newcons/etc/casper/
     - copied from r258947, head/etc/casper/
  user/ed/newcons/lib/libc/iconv/__iconv.c
     - copied unchanged from r258947, head/lib/libc/iconv/__iconv.c
  user/ed/newcons/lib/libc/iconv/__iconv_free_list.c
     - copied unchanged from r258947, head/lib/libc/iconv/__iconv_free_list.c
  user/ed/newcons/lib/libc/iconv/__iconv_get_list.c
     - copied unchanged from r258947, head/lib/libc/iconv/__iconv_get_list.c
  user/ed/newcons/lib/libc/iconv/bsd_iconv.c
     - copied unchanged from r258947, head/lib/libc/iconv/bsd_iconv.c
  user/ed/newcons/lib/libc/iconv/iconv-internal.h
     - copied unchanged from r258947, head/lib/libc/iconv/iconv-internal.h
  user/ed/newcons/lib/libc/iconv/iconv_canonicalize.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_canonicalize.c
  user/ed/newcons/lib/libc/iconv/iconv_close.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_close.c
  user/ed/newcons/lib/libc/iconv/iconv_compat.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_compat.c
  user/ed/newcons/lib/libc/iconv/iconv_open.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_open.c
  user/ed/newcons/lib/libc/iconv/iconv_open_into.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_open_into.c
  user/ed/newcons/lib/libc/iconv/iconv_set_relocation_prefix.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv_set_relocation_prefix.c
  user/ed/newcons/lib/libc/iconv/iconvctl.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconvctl.c
  user/ed/newcons/lib/libc/iconv/iconvlist.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconvlist.c
  user/ed/newcons/lib/libc_nonshared/
     - copied from r258947, head/lib/libc_nonshared/
  user/ed/newcons/lib/libcapsicum/
     - copied from r258947, head/lib/libcapsicum/
  user/ed/newcons/lib/libcasper/
     - copied from r258947, head/lib/libcasper/
  user/ed/newcons/lib/libpjdlog/
     - copied from r258947, head/lib/libpjdlog/
  user/ed/newcons/libexec/casper/
     - copied from r258947, head/libexec/casper/
  user/ed/newcons/release/amd64/pkg-stage.conf
     - copied unchanged from r258947, head/release/amd64/pkg-stage.conf
  user/ed/newcons/release/i386/pkg-stage.conf
     - copied unchanged from r258947, head/release/i386/pkg-stage.conf
  user/ed/newcons/release/scripts/pkg-stage.sh
     - copied unchanged from r258947, head/release/scripts/pkg-stage.sh
  user/ed/newcons/sbin/casperd/
     - copied from r258947, head/sbin/casperd/
  user/ed/newcons/share/examples/tests/
     - copied from r258947, head/share/examples/tests/
  user/ed/newcons/share/man/man4/axge.4
     - copied unchanged from r258947, head/share/man/man4/axge.4
  user/ed/newcons/share/tests/
     - copied from r258947, head/share/tests/
  user/ed/newcons/sys/amd64/vmm/io/vhpet.c
     - copied unchanged from r258947, head/sys/amd64/vmm/io/vhpet.c
  user/ed/newcons/sys/amd64/vmm/io/vhpet.h
     - copied unchanged from r258947, head/sys/amd64/vmm/io/vhpet.h
  user/ed/newcons/sys/arm/rockchip/rk30xx_wdog.c
     - copied unchanged from r258947, head/sys/arm/rockchip/rk30xx_wdog.c
  user/ed/newcons/sys/arm/rockchip/rk30xx_wdog.h
     - copied unchanged from r258947, head/sys/arm/rockchip/rk30xx_wdog.h
  user/ed/newcons/sys/arm/ti/ti_mbox.c
     - copied unchanged from r258947, head/sys/arm/ti/ti_mbox.c
  user/ed/newcons/sys/arm/ti/ti_mbox.h
     - copied unchanged from r258947, head/sys/arm/ti/ti_mbox.h
  user/ed/newcons/sys/arm/ti/ti_pruss.c
     - copied unchanged from r258947, head/sys/arm/ti/ti_pruss.c
  user/ed/newcons/sys/arm/ti/ti_pruss.h
     - copied unchanged from r258947, head/sys/arm/ti/ti_pruss.h
  user/ed/newcons/sys/cddl/compat/opensolaris/sys/disp.h
     - copied unchanged from r258947, head/sys/cddl/compat/opensolaris/sys/disp.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
     - copied unchanged from r258947, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c
     - copied unchanged from r258947, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
     - copied unchanged from r258947, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_reftree.h
     - copied unchanged from r258947, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_reftree.h
  user/ed/newcons/sys/dev/nand/nfc_at91.c
     - copied unchanged from r258947, head/sys/dev/nand/nfc_at91.c
  user/ed/newcons/sys/dev/usb/net/if_axge.c
     - copied unchanged from r258947, head/sys/dev/usb/net/if_axge.c
  user/ed/newcons/sys/dev/usb/net/if_axgereg.h
     - copied unchanged from r258947, head/sys/dev/usb/net/if_axgereg.h
  user/ed/newcons/sys/modules/usb/axge/
     - copied from r258947, head/sys/modules/usb/axge/
  user/ed/newcons/sys/net/ieee_oui.h
     - copied unchanged from r258947, head/sys/net/ieee_oui.h
  user/ed/newcons/sys/net/sff8472.h
     - copied unchanged from r258947, head/sys/net/sff8472.h
  user/ed/newcons/sys/powerpc/wii/ios_if.m
     - copied unchanged from r258947, head/sys/powerpc/wii/ios_if.m
  user/ed/newcons/sys/sys/ktr_class.h
     - copied unchanged from r258947, head/sys/sys/ktr_class.h
  user/ed/newcons/sys/sys/sf_sync.h
     - copied unchanged from r258947, head/sys/sys/sf_sync.h
  user/ed/newcons/tools/build/options/WITHOUT_CASPER
     - copied unchanged from r258947, head/tools/build/options/WITHOUT_CASPER
  user/ed/newcons/tools/regression/bin/sh/execution/bg10.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg10.0
  user/ed/newcons/tools/regression/bin/sh/execution/bg10.0.stdout
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg10.0.stdout
  user/ed/newcons/tools/regression/bin/sh/execution/bg5.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg5.0
  user/ed/newcons/tools/regression/bin/sh/execution/bg6.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg6.0
  user/ed/newcons/tools/regression/bin/sh/execution/bg6.0.stdout
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg6.0.stdout
  user/ed/newcons/tools/regression/bin/sh/execution/bg7.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg7.0
  user/ed/newcons/tools/regression/bin/sh/execution/bg8.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg8.0
  user/ed/newcons/tools/regression/bin/sh/execution/bg9.0
     - copied unchanged from r258947, head/tools/regression/bin/sh/execution/bg9.0
  user/ed/newcons/tools/regression/capsicum/libcapsicum/
     - copied from r258947, head/tools/regression/capsicum/libcapsicum/
  user/ed/newcons/usr.sbin/bsdconfig/includes/
     - copied from r258947, head/usr.sbin/bsdconfig/includes/
Replaced:
  user/ed/newcons/lib/libc/iconv/iconv.c
     - copied unchanged from r258947, head/lib/libc/iconv/iconv.c
Deleted:
  user/ed/newcons/contrib/apr-util/test/testssl.c
  user/ed/newcons/contrib/atf/Atffile
  user/ed/newcons/contrib/atf/Makefile.am
  user/ed/newcons/contrib/atf/Makefile.in
  user/ed/newcons/contrib/atf/admin/
  user/ed/newcons/contrib/atf/atf-c++/Atffile
  user/ed/newcons/contrib/atf/atf-c++/Makefile.am.inc
  user/ed/newcons/contrib/atf/atf-c++/detail/Atffile
  user/ed/newcons/contrib/atf/atf-c++/detail/Makefile.am.inc
  user/ed/newcons/contrib/atf/atf-c/Atffile
  user/ed/newcons/contrib/atf/atf-c/Makefile.am.inc
  user/ed/newcons/contrib/atf/atf-c/detail/Atffile
  user/ed/newcons/contrib/atf/atf-c/detail/Makefile.am.inc
  user/ed/newcons/contrib/atf/atf-c/detail/test_helpers_test.c
  user/ed/newcons/contrib/atf/atf-config/
  user/ed/newcons/contrib/atf/atf-report/
  user/ed/newcons/contrib/atf/atf-run/
  user/ed/newcons/contrib/atf/atf-sh/Atffile
  user/ed/newcons/contrib/atf/atf-sh/Makefile.am.inc
  user/ed/newcons/contrib/atf/atf-version/
  user/ed/newcons/contrib/atf/bconfig.h.in
  user/ed/newcons/contrib/atf/configure
  user/ed/newcons/contrib/atf/configure.ac
  user/ed/newcons/contrib/atf/doc/Makefile.am.inc
  user/ed/newcons/contrib/atf/doc/atf-formats.5
  user/ed/newcons/contrib/atf/doc/atf.7.in
  user/ed/newcons/contrib/atf/test-programs/Atffile
  user/ed/newcons/contrib/atf/test-programs/Makefile.am.inc
  user/ed/newcons/contrib/atf/test-programs/fork_test.sh
  user/ed/newcons/lib/libc/rpc/LICENSE
  user/ed/newcons/sys/arm/samsung/exynos/bus_space.c
  user/ed/newcons/sys/cddl/compat/opensolaris/sys/taskq.h
Modified:
  user/ed/newcons/Makefile.inc1
  user/ed/newcons/ObsoleteFiles.inc
  user/ed/newcons/UPDATING
  user/ed/newcons/bin/sh/cd.c
  user/ed/newcons/bin/sh/exec.c
  user/ed/newcons/bin/sh/expand.c
  user/ed/newcons/bin/sh/memalloc.c
  user/ed/newcons/bin/sh/mystring.c
  user/ed/newcons/bin/sh/mystring.h
  user/ed/newcons/bin/sh/redir.c
  user/ed/newcons/bin/sh/show.c
  user/ed/newcons/bin/sh/var.c
  user/ed/newcons/bin/test/test.c
  user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
  user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
  user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
  user/ed/newcons/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
  user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/ed/newcons/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  user/ed/newcons/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  user/ed/newcons/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  user/ed/newcons/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/ed/newcons/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
  user/ed/newcons/contrib/apr-util/CHANGES
  user/ed/newcons/contrib/apr-util/apr-util.spec
  user/ed/newcons/contrib/apr-util/configure
  user/ed/newcons/contrib/apr-util/crypto/apr_crypto.c
  user/ed/newcons/contrib/apr-util/dbd/apr_dbd.c
  user/ed/newcons/contrib/apr-util/dbd/apr_dbd_odbc.c
  user/ed/newcons/contrib/apr-util/dbm/apr_dbm.c
  user/ed/newcons/contrib/apr-util/include/apr_buckets.h
  user/ed/newcons/contrib/apr-util/include/apr_dbd.h
  user/ed/newcons/contrib/apr-util/include/apr_hooks.h
  user/ed/newcons/contrib/apr-util/include/apr_optional_hooks.h
  user/ed/newcons/contrib/apr-util/include/apr_queue.h
  user/ed/newcons/contrib/apr-util/include/apr_reslist.h
  user/ed/newcons/contrib/apr-util/include/apu.hw
  user/ed/newcons/contrib/apr-util/include/apu_version.h
  user/ed/newcons/contrib/apr-util/libaprutil.rc
  user/ed/newcons/contrib/apr-util/memcache/apr_memcache.c
  user/ed/newcons/contrib/apr-util/misc/apu_dso.c
  user/ed/newcons/contrib/apr-util/test/abts.c
  user/ed/newcons/contrib/apr-util/test/testpass.c
  user/ed/newcons/contrib/atf/FREEBSD-Xlist
  user/ed/newcons/contrib/atf/FREEBSD-upgrade
  user/ed/newcons/contrib/atf/NEWS
  user/ed/newcons/contrib/atf/atf-c++.hpp
  user/ed/newcons/contrib/atf/atf-c++/atf-c++-api.3
  user/ed/newcons/contrib/atf/atf-c++/check.hpp
  user/ed/newcons/contrib/atf/atf-c++/check_test.cpp
  user/ed/newcons/contrib/atf/atf-c++/detail/Kyuafile
  user/ed/newcons/contrib/atf/atf-c++/detail/parser.hpp
  user/ed/newcons/contrib/atf/atf-c++/detail/process.cpp
  user/ed/newcons/contrib/atf/atf-c++/detail/process.hpp
  user/ed/newcons/contrib/atf/atf-c++/detail/test_helpers.cpp
  user/ed/newcons/contrib/atf/atf-c++/detail/test_helpers.hpp
  user/ed/newcons/contrib/atf/atf-c++/macros_test.cpp
  user/ed/newcons/contrib/atf/atf-c++/pkg_config_test.sh
  user/ed/newcons/contrib/atf/atf-c++/tests.cpp
  user/ed/newcons/contrib/atf/atf-c++/tests.hpp
  user/ed/newcons/contrib/atf/atf-c++/utils.hpp
  user/ed/newcons/contrib/atf/atf-c++/utils_test.cpp
  user/ed/newcons/contrib/atf/atf-c.h
  user/ed/newcons/contrib/atf/atf-c/atf-c-api.3
  user/ed/newcons/contrib/atf/atf-c/check_test.c
  user/ed/newcons/contrib/atf/atf-c/detail/Kyuafile
  user/ed/newcons/contrib/atf/atf-c/detail/process_test.c
  user/ed/newcons/contrib/atf/atf-c/detail/sanity_test.c
  user/ed/newcons/contrib/atf/atf-c/detail/test_helpers.c
  user/ed/newcons/contrib/atf/atf-c/detail/test_helpers.h
  user/ed/newcons/contrib/atf/atf-c/macros.h
  user/ed/newcons/contrib/atf/atf-c/macros_test.c
  user/ed/newcons/contrib/atf/atf-c/pkg_config_test.sh
  user/ed/newcons/contrib/atf/atf-c/utils.c
  user/ed/newcons/contrib/atf/atf-c/utils.h
  user/ed/newcons/contrib/atf/atf-c/utils_test.c
  user/ed/newcons/contrib/atf/atf-sh/atf-check.cpp
  user/ed/newcons/contrib/atf/atf-sh/atf-check_test.sh
  user/ed/newcons/contrib/atf/atf-sh/atf-sh-api.3
  user/ed/newcons/contrib/atf/atf-sh/atf-sh.1
  user/ed/newcons/contrib/atf/atf-sh/atf_check_test.sh
  user/ed/newcons/contrib/atf/atf-sh/misc_helpers.sh
  user/ed/newcons/contrib/atf/bconfig.h
  user/ed/newcons/contrib/atf/test-programs/Kyuafile
  user/ed/newcons/contrib/atf/test-programs/c_helpers.c
  user/ed/newcons/contrib/atf/test-programs/cpp_helpers.cpp
  user/ed/newcons/contrib/atf/test-programs/sh_helpers.sh
  user/ed/newcons/contrib/bmake/hash.c
  user/ed/newcons/contrib/bmake/lst.lib/lstMember.c
  user/ed/newcons/contrib/gcc/ChangeLog.gcc43
  user/ed/newcons/contrib/gcc/Makefile.in
  user/ed/newcons/contrib/gcc/builtin-types.def
  user/ed/newcons/contrib/gcc/builtins.c
  user/ed/newcons/contrib/gcc/builtins.def
  user/ed/newcons/contrib/gcc/c-common.c
  user/ed/newcons/contrib/gcc/c-common.h
  user/ed/newcons/contrib/gcc/c-decl.c
  user/ed/newcons/contrib/gcc/c-opts.c
  user/ed/newcons/contrib/gcc/c-ppoutput.c
  user/ed/newcons/contrib/gcc/c-typeck.c
  user/ed/newcons/contrib/gcc/c.opt
  user/ed/newcons/contrib/gcc/cgraphunit.c
  user/ed/newcons/contrib/gcc/collect2.c
  user/ed/newcons/contrib/gcc/common.opt
  user/ed/newcons/contrib/gcc/config/i386/beos-elf.h
  user/ed/newcons/contrib/gcc/config/i386/cygwin.h
  user/ed/newcons/contrib/gcc/config/i386/i386.c
  user/ed/newcons/contrib/gcc/config/i386/i386.h
  user/ed/newcons/contrib/gcc/config/i386/i386.md
  user/ed/newcons/contrib/gcc/config/i386/nto.h
  user/ed/newcons/contrib/gcc/config/rs6000/aix.h
  user/ed/newcons/contrib/gcc/config/rs6000/rs6000.c
  user/ed/newcons/contrib/gcc/config/rs6000/sysv4.h
  user/ed/newcons/contrib/gcc/config/svr4.h
  user/ed/newcons/contrib/gcc/configure
  user/ed/newcons/contrib/gcc/configure.ac
  user/ed/newcons/contrib/gcc/coverage.c
  user/ed/newcons/contrib/gcc/cp/cp-lang.c
  user/ed/newcons/contrib/gcc/cp/cp-tree.h
  user/ed/newcons/contrib/gcc/cp/decl.c
  user/ed/newcons/contrib/gcc/cp/decl2.c
  user/ed/newcons/contrib/gcc/cp/mangle.c
  user/ed/newcons/contrib/gcc/cp/name-lookup.c
  user/ed/newcons/contrib/gcc/cp/semantics.c
  user/ed/newcons/contrib/gcc/cp/tree.c
  user/ed/newcons/contrib/gcc/cp/typeck.c
  user/ed/newcons/contrib/gcc/cppdefault.c
  user/ed/newcons/contrib/gcc/doc/cppopts.texi
  user/ed/newcons/contrib/gcc/doc/extend.texi
  user/ed/newcons/contrib/gcc/doc/invoke.texi
  user/ed/newcons/contrib/gcc/doc/libgcc.texi
  user/ed/newcons/contrib/gcc/doc/rtl.texi
  user/ed/newcons/contrib/gcc/dwarf2out.c
  user/ed/newcons/contrib/gcc/expr.c
  user/ed/newcons/contrib/gcc/final.c
  user/ed/newcons/contrib/gcc/flags.h
  user/ed/newcons/contrib/gcc/fold-const.c
  user/ed/newcons/contrib/gcc/gcc.c
  user/ed/newcons/contrib/gcc/genattrtab.c
  user/ed/newcons/contrib/gcc/genopinit.c
  user/ed/newcons/contrib/gcc/gimplify.c
  user/ed/newcons/contrib/gcc/langhooks-def.h
  user/ed/newcons/contrib/gcc/langhooks.h
  user/ed/newcons/contrib/gcc/libgcc-std.ver
  user/ed/newcons/contrib/gcc/libgcc2.c
  user/ed/newcons/contrib/gcc/libgcc2.h
  user/ed/newcons/contrib/gcc/mips-tdump.c
  user/ed/newcons/contrib/gcc/mips-tfile.c
  user/ed/newcons/contrib/gcc/mklibgcc.in
  user/ed/newcons/contrib/gcc/optabs.c
  user/ed/newcons/contrib/gcc/optabs.h
  user/ed/newcons/contrib/gcc/opts.c
  user/ed/newcons/contrib/gcc/postreload-gcse.c
  user/ed/newcons/contrib/gcc/print-tree.c
  user/ed/newcons/contrib/gcc/regs.h
  user/ed/newcons/contrib/gcc/reload1.c
  user/ed/newcons/contrib/gcc/rtl.def
  user/ed/newcons/contrib/gcc/rtlanal.c
  user/ed/newcons/contrib/gcc/simplify-rtx.c
  user/ed/newcons/contrib/gcc/toplev.c
  user/ed/newcons/contrib/gcc/tree-flow.h
  user/ed/newcons/contrib/gcc/tree-ssa-alias.c
  user/ed/newcons/contrib/gcc/tree-ssa-propagate.c
  user/ed/newcons/contrib/gcc/tree-vrp.c
  user/ed/newcons/contrib/gcc/tree.c
  user/ed/newcons/contrib/gcc/tree.h
  user/ed/newcons/contrib/gcc/varasm.c
  user/ed/newcons/contrib/gcclibs/libcpp/Makefile.in
  user/ed/newcons/contrib/gcclibs/libcpp/charset.c
  user/ed/newcons/contrib/gcclibs/libcpp/directives.c
  user/ed/newcons/contrib/gcclibs/libcpp/errors.c
  user/ed/newcons/contrib/gcclibs/libcpp/expr.c
  user/ed/newcons/contrib/gcclibs/libcpp/files.c
  user/ed/newcons/contrib/gcclibs/libcpp/include/cpplib.h
  user/ed/newcons/contrib/gcclibs/libcpp/init.c
  user/ed/newcons/contrib/gcclibs/libcpp/internal.h
  user/ed/newcons/contrib/gcclibs/libcpp/lex.c
  user/ed/newcons/contrib/gcclibs/libcpp/macro.c
  user/ed/newcons/contrib/gcclibs/libcpp/pch.c
  user/ed/newcons/contrib/gcclibs/libiberty/choose-temp.c
  user/ed/newcons/contrib/gcclibs/libiberty/cp-demangle.c
  user/ed/newcons/contrib/gcclibs/libiberty/cp-demangle.h
  user/ed/newcons/contrib/gcclibs/libiberty/floatformat.c
  user/ed/newcons/contrib/gcclibs/libiberty/functions.texi
  user/ed/newcons/contrib/gcclibs/libiberty/pex-unix.c
  user/ed/newcons/contrib/gcclibs/libiberty/strsignal.c
  user/ed/newcons/contrib/gcclibs/libiberty/testsuite/demangle-expected
  user/ed/newcons/contrib/gcclibs/libiberty/testsuite/test-demangle.c
  user/ed/newcons/contrib/gdb/gdb/amd64fbsd-nat.c
  user/ed/newcons/contrib/gperf/doc/gperf.1
  user/ed/newcons/contrib/gperf/src/options.cc
  user/ed/newcons/contrib/gperf/src/options.h
  user/ed/newcons/contrib/gperf/src/options.icc
  user/ed/newcons/contrib/gperf/src/output.cc
  user/ed/newcons/contrib/libexecinfo/backtrace.c
  user/ed/newcons/contrib/libstdc++/include/bits/basic_string.h
  user/ed/newcons/contrib/libstdc++/include/bits/basic_string.tcc
  user/ed/newcons/contrib/libstdc++/include/bits/stl_algobase.h
  user/ed/newcons/contrib/libstdc++/include/bits/stl_tree.h
  user/ed/newcons/contrib/libstdc++/include/bits/stl_vector.h
  user/ed/newcons/contrib/libstdc++/include/ext/hashtable.h
  user/ed/newcons/contrib/libstdc++/include/ext/mt_allocator.h
  user/ed/newcons/contrib/libstdc++/include/ext/throw_allocator.h
  user/ed/newcons/contrib/libstdc++/libsupc++/eh_alloc.cc
  user/ed/newcons/contrib/libstdc++/src/mt_allocator.cc
  user/ed/newcons/contrib/llvm/lib/Analysis/CaptureTracking.cpp
  user/ed/newcons/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBError.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Core/Address.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Core/Module.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Host/File.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Host/Host.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/Process.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/Target.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
  user/ed/newcons/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBModule.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBProcess.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBStream.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBTarget.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/API/SBThread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/Address.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/Debugger.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/Module.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Host/common/File.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Host/common/Host.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/Platform.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/Process.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/Target.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/Thread.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h
  user/ed/newcons/contrib/llvm/tools/lldb/source/lldb.cpp
  user/ed/newcons/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp
  user/ed/newcons/contrib/mdocml/lib.in
  user/ed/newcons/contrib/mtree/compare.c
  user/ed/newcons/contrib/mtree/create.c
  user/ed/newcons/contrib/mtree/spec.c
  user/ed/newcons/contrib/netcat/nc.1
  user/ed/newcons/contrib/netcat/netcat.c
  user/ed/newcons/contrib/subversion/CHANGES
  user/ed/newcons/contrib/subversion/Makefile.in
  user/ed/newcons/contrib/subversion/build-outputs.mk
  user/ed/newcons/contrib/subversion/build.conf
  user/ed/newcons/contrib/subversion/configure
  user/ed/newcons/contrib/subversion/configure.ac
  user/ed/newcons/contrib/subversion/subversion/include/svn_version.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_client/externals.c
  user/ed/newcons/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  user/ed/newcons/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_wc/diff.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_wc/diff_local.c
  user/ed/newcons/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  user/ed/newcons/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  user/ed/newcons/contrib/tcpdump/extract.h
  user/ed/newcons/etc/Makefile
  user/ed/newcons/etc/devd/usb.conf
  user/ed/newcons/etc/gettytab
  user/ed/newcons/etc/mtree/BSD.include.dist
  user/ed/newcons/etc/mtree/BSD.root.dist
  user/ed/newcons/etc/mtree/BSD.tests.dist
  user/ed/newcons/etc/mtree/BSD.usr.dist
  user/ed/newcons/etc/mtree/BSD.var.dist
  user/ed/newcons/etc/mtree/Makefile
  user/ed/newcons/etc/pf.os
  user/ed/newcons/etc/pkg/FreeBSD.conf
  user/ed/newcons/etc/rc
  user/ed/newcons/etc/services
  user/ed/newcons/gnu/usr.bin/cc/Makefile.inc
  user/ed/newcons/gnu/usr.bin/cc/cc_int/Makefile
  user/ed/newcons/gnu/usr.bin/cc/cc_tools/freebsd-native.h
  user/ed/newcons/gnu/usr.bin/cc/libcpp/Makefile
  user/ed/newcons/include/iconv.h
  user/ed/newcons/include/rpc/auth.h
  user/ed/newcons/include/rpc/auth_des.h
  user/ed/newcons/include/rpc/auth_kerb.h
  user/ed/newcons/include/rpc/auth_unix.h
  user/ed/newcons/include/rpc/clnt.h
  user/ed/newcons/include/rpc/clnt_soc.h
  user/ed/newcons/include/rpc/des.h
  user/ed/newcons/include/rpc/des_crypt.h
  user/ed/newcons/include/rpc/nettype.h
  user/ed/newcons/include/rpc/pmap_clnt.h
  user/ed/newcons/include/rpc/pmap_prot.h
  user/ed/newcons/include/rpc/pmap_rmt.h
  user/ed/newcons/include/rpc/raw.h
  user/ed/newcons/include/rpc/rpc.h
  user/ed/newcons/include/rpc/rpc_com.h
  user/ed/newcons/include/rpc/rpc_msg.h
  user/ed/newcons/include/rpc/rpcb_clnt.h
  user/ed/newcons/include/rpc/rpcb_prot.x
  user/ed/newcons/include/rpc/rpcent.h
  user/ed/newcons/include/rpc/svc.h
  user/ed/newcons/include/rpc/svc_auth.h
  user/ed/newcons/include/rpc/svc_dg.h
  user/ed/newcons/include/rpc/svc_soc.h
  user/ed/newcons/include/rpc/xdr.h
  user/ed/newcons/lib/Makefile
  user/ed/newcons/lib/atf/libatf-c++/Makefile
  user/ed/newcons/lib/atf/libatf-c++/tests/Makefile
  user/ed/newcons/lib/atf/libatf-c/tests/Makefile
  user/ed/newcons/lib/atf/tests/test-programs/Makefile
  user/ed/newcons/lib/clang/liblldbAPI/Makefile
  user/ed/newcons/lib/clang/liblldbPluginProcessFreeBSD/Makefile
  user/ed/newcons/lib/clang/liblldbPluginProcessUtility/Makefile
  user/ed/newcons/lib/libc/Makefile
  user/ed/newcons/lib/libc/amd64/SYS.h
  user/ed/newcons/lib/libc/amd64/gen/_setjmp.S
  user/ed/newcons/lib/libc/amd64/gen/setjmp.S
  user/ed/newcons/lib/libc/amd64/gen/sigsetjmp.S
  user/ed/newcons/lib/libc/amd64/sys/getcontext.S
  user/ed/newcons/lib/libc/amd64/sys/pipe.S
  user/ed/newcons/lib/libc/amd64/sys/reboot.S
  user/ed/newcons/lib/libc/amd64/sys/setlogin.S
  user/ed/newcons/lib/libc/amd64/sys/vfork.S
  user/ed/newcons/lib/libc/i386/SYS.h
  user/ed/newcons/lib/libc/i386/gen/_setjmp.S
  user/ed/newcons/lib/libc/i386/gen/setjmp.S
  user/ed/newcons/lib/libc/i386/gen/sigsetjmp.S
  user/ed/newcons/lib/libc/i386/string/strchr.S
  user/ed/newcons/lib/libc/i386/string/strrchr.S
  user/ed/newcons/lib/libc/i386/sys/Ovfork.S
  user/ed/newcons/lib/libc/i386/sys/getcontext.S
  user/ed/newcons/lib/libc/iconv/Makefile.inc
  user/ed/newcons/lib/libc/iconv/Symbol.map
  user/ed/newcons/lib/libc/iconv/citrus_iconv_local.h
  user/ed/newcons/lib/libc/iconv/iconvctl.3
  user/ed/newcons/lib/libc/libc.ldscript
  user/ed/newcons/lib/libc/powerpc/SYS.h
  user/ed/newcons/lib/libc/powerpc64/SYS.h
  user/ed/newcons/lib/libc/rpc/DISCLAIMER
  user/ed/newcons/lib/libc/rpc/auth_des.c
  user/ed/newcons/lib/libc/rpc/auth_none.c
  user/ed/newcons/lib/libc/rpc/auth_unix.c
  user/ed/newcons/lib/libc/rpc/authdes_prot.c
  user/ed/newcons/lib/libc/rpc/authunix_prot.c
  user/ed/newcons/lib/libc/rpc/bindresvport.c
  user/ed/newcons/lib/libc/rpc/clnt_bcast.c
  user/ed/newcons/lib/libc/rpc/clnt_dg.c
  user/ed/newcons/lib/libc/rpc/clnt_generic.c
  user/ed/newcons/lib/libc/rpc/clnt_perror.c
  user/ed/newcons/lib/libc/rpc/clnt_raw.c
  user/ed/newcons/lib/libc/rpc/clnt_simple.c
  user/ed/newcons/lib/libc/rpc/clnt_vc.c
  user/ed/newcons/lib/libc/rpc/des_crypt.c
  user/ed/newcons/lib/libc/rpc/des_soft.c
  user/ed/newcons/lib/libc/rpc/getnetconfig.c
  user/ed/newcons/lib/libc/rpc/getnetpath.c
  user/ed/newcons/lib/libc/rpc/getpublickey.c
  user/ed/newcons/lib/libc/rpc/getrpcent.c
  user/ed/newcons/lib/libc/rpc/getrpcport.c
  user/ed/newcons/lib/libc/rpc/key_call.c
  user/ed/newcons/lib/libc/rpc/key_prot_xdr.c
  user/ed/newcons/lib/libc/rpc/netname.c
  user/ed/newcons/lib/libc/rpc/netnamer.c
  user/ed/newcons/lib/libc/rpc/pmap_clnt.c
  user/ed/newcons/lib/libc/rpc/pmap_getmaps.c
  user/ed/newcons/lib/libc/rpc/pmap_getport.c
  user/ed/newcons/lib/libc/rpc/pmap_prot.c
  user/ed/newcons/lib/libc/rpc/pmap_prot2.c
  user/ed/newcons/lib/libc/rpc/pmap_rmt.c
  user/ed/newcons/lib/libc/rpc/rpc_callmsg.c
  user/ed/newcons/lib/libc/rpc/rpc_com.h
  user/ed/newcons/lib/libc/rpc/rpc_commondata.c
  user/ed/newcons/lib/libc/rpc/rpc_dtablesize.c
  user/ed/newcons/lib/libc/rpc/rpc_generic.c
  user/ed/newcons/lib/libc/rpc/rpc_prot.c
  user/ed/newcons/lib/libc/rpc/rpc_soc.c
  user/ed/newcons/lib/libc/rpc/rpcb_clnt.c
  user/ed/newcons/lib/libc/rpc/rpcb_prot.c
  user/ed/newcons/lib/libc/rpc/rpcb_st_xdr.c
  user/ed/newcons/lib/libc/rpc/rpcdname.c
  user/ed/newcons/lib/libc/rpc/rtime.c
  user/ed/newcons/lib/libc/rpc/svc.c
  user/ed/newcons/lib/libc/rpc/svc_auth.c
  user/ed/newcons/lib/libc/rpc/svc_auth_des.c
  user/ed/newcons/lib/libc/rpc/svc_auth_unix.c
  user/ed/newcons/lib/libc/rpc/svc_dg.c
  user/ed/newcons/lib/libc/rpc/svc_generic.c
  user/ed/newcons/lib/libc/rpc/svc_raw.c
  user/ed/newcons/lib/libc/rpc/svc_run.c
  user/ed/newcons/lib/libc/rpc/svc_simple.c
  user/ed/newcons/lib/libc/rpc/svc_vc.c
  user/ed/newcons/lib/libc/sparc64/fpu/fpu.c
  user/ed/newcons/lib/libc/sparc64/fpu/fpu_sqrt.c
  user/ed/newcons/lib/libc/stdio/printf_l.3
  user/ed/newcons/lib/libc/stdio/scanf_l.3
  user/ed/newcons/lib/libc/sys/chmod.2
  user/ed/newcons/lib/libc/sys/pdfork.2
  user/ed/newcons/lib/libc/sys/wait.2
  user/ed/newcons/lib/libc/xdr/xdr_rec.c
  user/ed/newcons/lib/libfetch/common.c
  user/ed/newcons/lib/libiconv_modules/UTF7/citrus_utf7.c
  user/ed/newcons/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
  user/ed/newcons/lib/libkse/arch/i386/i386/thr_getcontext.S
  user/ed/newcons/lib/libnetgraph/netgraph.3
  user/ed/newcons/lib/libnv/nvpair.c
  user/ed/newcons/lib/libpam/libpam/Makefile
  user/ed/newcons/lib/libpmc/pmc.h
  user/ed/newcons/lib/libstand/libstand.3
  user/ed/newcons/lib/libthr/thread/thr_private.h
  user/ed/newcons/lib/libthr/thread/thr_sig.c
  user/ed/newcons/lib/libvmmapi/vmmapi.c
  user/ed/newcons/lib/libvmmapi/vmmapi.h
  user/ed/newcons/libexec/Makefile
  user/ed/newcons/release/Makefile
  user/ed/newcons/release/doc/de_DE.ISO8859-1/readme/article.xml
  user/ed/newcons/release/doc/en_US.ISO8859-1/errata/article.xml
  user/ed/newcons/release/doc/en_US.ISO8859-1/hardware/article.xml
  user/ed/newcons/release/doc/en_US.ISO8859-1/readme/article.xml
  user/ed/newcons/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/ed/newcons/release/doc/ru_RU.KOI8-R/readme/article.xml
  user/ed/newcons/release/doc/zh_CN.GB2312/readme/article.xml
  user/ed/newcons/release/release.sh
  user/ed/newcons/sbin/Makefile
  user/ed/newcons/sbin/fdisk/fdisk.c
  user/ed/newcons/sbin/geom/class/mirror/geom_mirror.c
  user/ed/newcons/sbin/geom/class/mirror/gmirror.8
  user/ed/newcons/sbin/growfs/growfs.8
  user/ed/newcons/sbin/ipfw/ipfw2.c
  user/ed/newcons/sbin/ipfw/ipfw2.h
  user/ed/newcons/sbin/mdconfig/mdconfig.8
  user/ed/newcons/sbin/mdconfig/mdconfig.c
  user/ed/newcons/sbin/pfctl/pfctl.c
  user/ed/newcons/sbin/route/route.c
  user/ed/newcons/sbin/swapon/swapon.8
  user/ed/newcons/sbin/sysctl/sysctl.c
  user/ed/newcons/share/Makefile
  user/ed/newcons/share/examples/Makefile
  user/ed/newcons/share/i18n/esdb/UTF/UTF.alias
  user/ed/newcons/share/man/man4/Makefile
  user/ed/newcons/share/man/man4/capsicum.4
  user/ed/newcons/share/man/man4/iwn.4
  user/ed/newcons/share/man/man4/netgraph.4
  user/ed/newcons/share/man/man4/pf.4
  user/ed/newcons/share/man/man4/procdesc.4
  user/ed/newcons/share/man/man4/rights.4
  user/ed/newcons/share/man/man4/u3g.4
  user/ed/newcons/share/man/man4/usb.4
  user/ed/newcons/share/man/man5/rc.conf.5
  user/ed/newcons/share/man/man5/src.conf.5
  user/ed/newcons/share/man/man7/development.7
  user/ed/newcons/share/man/man7/release.7
  user/ed/newcons/share/man/man9/SDT.9
  user/ed/newcons/share/misc/bsd-family-tree
  user/ed/newcons/share/misc/committers-src.dot   (contents, props changed)
  user/ed/newcons/share/mk/Makefile
  user/ed/newcons/share/mk/atf.test.mk
  user/ed/newcons/share/mk/bsd.libnames.mk
  user/ed/newcons/share/mk/bsd.own.mk
  user/ed/newcons/share/mk/bsd.progs.mk
  user/ed/newcons/share/mk/plain.test.mk
  user/ed/newcons/sys/amd64/amd64/exception.S
  user/ed/newcons/sys/amd64/amd64/machdep.c
  user/ed/newcons/sys/amd64/amd64/trap.c
  user/ed/newcons/sys/amd64/conf/GENERIC
  user/ed/newcons/sys/amd64/ia32/ia32_signal.c
  user/ed/newcons/sys/amd64/include/asm.h
  user/ed/newcons/sys/amd64/include/pcb.h
  user/ed/newcons/sys/amd64/include/segments.h
  user/ed/newcons/sys/amd64/include/vmm.h   (contents, props changed)
  user/ed/newcons/sys/amd64/include/vmm_dev.h   (contents, props changed)
  user/ed/newcons/sys/amd64/linux32/linux32_dummy.c
  user/ed/newcons/sys/amd64/linux32/linux32_sysvec.c
  user/ed/newcons/sys/amd64/pci/pci_cfgreg.c
  user/ed/newcons/sys/amd64/vmm/intel/vmcs.h
  user/ed/newcons/sys/amd64/vmm/intel/vmx.c
  user/ed/newcons/sys/amd64/vmm/intel/vmx_controls.h
  user/ed/newcons/sys/amd64/vmm/intel/vtd.c
  user/ed/newcons/sys/amd64/vmm/io/ppt.c
  user/ed/newcons/sys/amd64/vmm/io/vioapic.c
  user/ed/newcons/sys/amd64/vmm/io/vioapic.h
  user/ed/newcons/sys/amd64/vmm/io/vlapic.c
  user/ed/newcons/sys/amd64/vmm/io/vlapic.h
  user/ed/newcons/sys/amd64/vmm/vmm.c
  user/ed/newcons/sys/amd64/vmm/vmm_dev.c
  user/ed/newcons/sys/amd64/vmm/vmm_ktr.h
  user/ed/newcons/sys/amd64/vmm/vmm_lapic.c
  user/ed/newcons/sys/amd64/vmm/vmm_lapic.h
  user/ed/newcons/sys/arm/arm/db_trace.c
  user/ed/newcons/sys/arm/arm/devmap.c
  user/ed/newcons/sys/arm/arm/locore.S
  user/ed/newcons/sys/arm/arm/machdep.c
  user/ed/newcons/sys/arm/arm/pl190.c
  user/ed/newcons/sys/arm/arm/pmap-v6.c
  user/ed/newcons/sys/arm/arm/trap.c
  user/ed/newcons/sys/arm/at91/at91_machdep.c
  user/ed/newcons/sys/arm/at91/at91_pioreg.h
  user/ed/newcons/sys/arm/at91/files.at91
  user/ed/newcons/sys/arm/at91/if_macbvar.h
  user/ed/newcons/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  user/ed/newcons/sys/arm/conf/BEAGLEBONE
  user/ed/newcons/sys/arm/econa/econa_machdep.c
  user/ed/newcons/sys/arm/econa/if_ece.c
  user/ed/newcons/sys/arm/econa/uart_bus_ec.c
  user/ed/newcons/sys/arm/econa/uart_cpu_ec.c
  user/ed/newcons/sys/arm/freescale/imx/imx6_anatopreg.h
  user/ed/newcons/sys/arm/freescale/imx/imx6_usbphy.c
  user/ed/newcons/sys/arm/freescale/imx/imx_gptreg.h
  user/ed/newcons/sys/arm/freescale/vybrid/vf_anadig.c
  user/ed/newcons/sys/arm/freescale/vybrid/vf_ccm.c
  user/ed/newcons/sys/arm/freescale/vybrid/vf_ehci.c
  user/ed/newcons/sys/arm/include/armreg.h
  user/ed/newcons/sys/arm/include/machdep.h
  user/ed/newcons/sys/arm/lpc/if_lpereg.h
  user/ed/newcons/sys/arm/lpc/lpcreg.h
  user/ed/newcons/sys/arm/mv/mv_machdep.c
  user/ed/newcons/sys/arm/mv/mv_pci.c
  user/ed/newcons/sys/arm/rockchip/files.rk30xx
  user/ed/newcons/sys/arm/rockchip/rk30xx_machdep.c
  user/ed/newcons/sys/arm/s3c2xx0/s3c24x0_machdep.c
  user/ed/newcons/sys/arm/sa11x0/assabet_machdep.c
  user/ed/newcons/sys/arm/samsung/exynos/ehci_exynos5.c
  user/ed/newcons/sys/arm/samsung/exynos/exynos5_machdep.c
  user/ed/newcons/sys/arm/samsung/exynos/files.exynos5
  user/ed/newcons/sys/arm/ti/files.ti
  user/ed/newcons/sys/arm/ti/ti_sdhci.c
  user/ed/newcons/sys/arm/xscale/i80321/ep80219_machdep.c
  user/ed/newcons/sys/arm/xscale/i80321/iq31244_machdep.c
  user/ed/newcons/sys/arm/xscale/i8134x/crb_machdep.c
  user/ed/newcons/sys/arm/xscale/i8134x/i81342reg.h
  user/ed/newcons/sys/arm/xscale/ixp425/avila_machdep.c
  user/ed/newcons/sys/arm/xscale/ixp425/ixp425reg.h
  user/ed/newcons/sys/arm/xscale/pxa/pxa_machdep.c
  user/ed/newcons/sys/boot/arm/at91/libat91/mci_device.h
  user/ed/newcons/sys/boot/arm/uboot/start.S
  user/ed/newcons/sys/boot/fdt/dts/rk3188.dtsi
  user/ed/newcons/sys/boot/fdt/dts/rpi.dts
  user/ed/newcons/sys/boot/forth/beastie.4th
  user/ed/newcons/sys/boot/forth/loader.4th
  user/ed/newcons/sys/boot/forth/loader.4th.8
  user/ed/newcons/sys/boot/forth/loader.rc
  user/ed/newcons/sys/boot/forth/menu.rc
  user/ed/newcons/sys/boot/i386/efi/reloc.c
  user/ed/newcons/sys/boot/i386/libfirewire/fwohci.h
  user/ed/newcons/sys/boot/i386/libfirewire/fwohcireg.h
  user/ed/newcons/sys/boot/i386/loader/loader.rc
  user/ed/newcons/sys/cam/ctl/ctl_backend_block.c
  user/ed/newcons/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
  user/ed/newcons/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
  user/ed/newcons/sys/cddl/compat/opensolaris/sys/sdt.h
  user/ed/newcons/sys/cddl/compat/opensolaris/sys/vm.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
  user/ed/newcons/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
  user/ed/newcons/sys/cddl/dev/dtrace/dtrace_test.c
  user/ed/newcons/sys/cddl/dev/fbt/fbt_powerpc.c
  user/ed/newcons/sys/cddl/dev/lockstat/lockstat.c
  user/ed/newcons/sys/cddl/dev/sdt/sdt.c
  user/ed/newcons/sys/compat/freebsd32/freebsd32.h
  user/ed/newcons/sys/compat/freebsd32/freebsd32_misc.c
  user/ed/newcons/sys/compat/linux/linux_dtrace.h
  user/ed/newcons/sys/compat/linux/linux_emul.c
  user/ed/newcons/sys/compat/linux/linux_fork.c
  user/ed/newcons/sys/compat/linux/linux_futex.c
  user/ed/newcons/sys/compat/linux/linux_mib.c
  user/ed/newcons/sys/compat/linux/linux_misc.c
  user/ed/newcons/sys/compat/linux/linux_sysctl.c
  user/ed/newcons/sys/compat/linux/linux_time.c
  user/ed/newcons/sys/compat/linux/linux_uid16.c
  user/ed/newcons/sys/compat/linux/linux_util.c
  user/ed/newcons/sys/conf/NOTES
  user/ed/newcons/sys/conf/files
  user/ed/newcons/sys/conf/files.powerpc
  user/ed/newcons/sys/conf/kern.pre.mk
  user/ed/newcons/sys/conf/options
  user/ed/newcons/sys/conf/options.amd64
  user/ed/newcons/sys/conf/options.arm
  user/ed/newcons/sys/crypto/aesni/aesni.c
  user/ed/newcons/sys/dev/aac/aacvar.h
  user/ed/newcons/sys/dev/acpica/acpi_hpet.c
  user/ed/newcons/sys/dev/acpica/acpi_video.c
  user/ed/newcons/sys/dev/agp/agp_i810.c
  user/ed/newcons/sys/dev/ahci/ahci.c
  user/ed/newcons/sys/dev/ahci/ahci.h
  user/ed/newcons/sys/dev/ata/ata-pci.h
  user/ed/newcons/sys/dev/ata/chipsets/ata-intel.c
  user/ed/newcons/sys/dev/bge/if_bge.c
  user/ed/newcons/sys/dev/bge/if_bgereg.h
  user/ed/newcons/sys/dev/bktr/bktr_core.c
  user/ed/newcons/sys/dev/bxe/bxe.c
  user/ed/newcons/sys/dev/bxe/bxe.h
  user/ed/newcons/sys/dev/bxe/bxe_elink.c
  user/ed/newcons/sys/dev/bxe/ecore_hsi.h
  user/ed/newcons/sys/dev/bxe/ecore_init.h
  user/ed/newcons/sys/dev/bxe/ecore_reg.h
  user/ed/newcons/sys/dev/bxe/ecore_sp.c
  user/ed/newcons/sys/dev/bxe/ecore_sp.h
  user/ed/newcons/sys/dev/cesa/cesa.h
  user/ed/newcons/sys/dev/cxgbe/common/common.h
  user/ed/newcons/sys/dev/cxgbe/common/t4_hw.c
  user/ed/newcons/sys/dev/cxgbe/t4_ioctl.h
  user/ed/newcons/sys/dev/cxgbe/t4_main.c
  user/ed/newcons/sys/dev/cxgbe/t4_sge.c
  user/ed/newcons/sys/dev/drm/i915_reg.h
  user/ed/newcons/sys/dev/drm/mach64_drv.h
  user/ed/newcons/sys/dev/drm/mga_drv.h
  user/ed/newcons/sys/dev/drm/r128_drv.h
  user/ed/newcons/sys/dev/drm/r300_reg.h
  user/ed/newcons/sys/dev/drm/r600_blit.c
  user/ed/newcons/sys/dev/drm/radeon_cp.c
  user/ed/newcons/sys/dev/drm/radeon_drv.h
  user/ed/newcons/sys/dev/drm/via_irq.c
  user/ed/newcons/sys/dev/drm2/drm.h
  user/ed/newcons/sys/dev/drm2/drmP.h
  user/ed/newcons/sys/dev/drm2/drm_drv.c
  user/ed/newcons/sys/dev/drm2/drm_ioctl.c
  user/ed/newcons/sys/dev/drm2/drm_linux_list_sort.c
  user/ed/newcons/sys/dev/drm2/drm_pci.c
  user/ed/newcons/sys/dev/drm2/radeon/evergreen_blit_kms.c
  user/ed/newcons/sys/dev/drm2/radeon/evergreen_cs.c
  user/ed/newcons/sys/dev/drm2/radeon/evergreend.h
  user/ed/newcons/sys/dev/drm2/radeon/nid.h
  user/ed/newcons/sys/dev/drm2/radeon/r200.c
  user/ed/newcons/sys/dev/drm2/radeon/r300.c
  user/ed/newcons/sys/dev/drm2/radeon/r300_reg.h
  user/ed/newcons/sys/dev/drm2/radeon/r500_reg.h
  user/ed/newcons/sys/dev/drm2/radeon/r600_blit.c
  user/ed/newcons/sys/dev/drm2/radeon/r600_blit_kms.c
  user/ed/newcons/sys/dev/drm2/radeon/r600_cs.c
  user/ed/newcons/sys/dev/drm2/radeon/r600d.h
  user/ed/newcons/sys/dev/drm2/radeon/radeon_cp.c
  user/ed/newcons/sys/dev/drm2/radeon/radeon_drv.h
  user/ed/newcons/sys/dev/drm2/radeon/radeon_reg.h
  user/ed/newcons/sys/dev/drm2/radeon/rv770d.h
  user/ed/newcons/sys/dev/drm2/radeon/sid.h
  user/ed/newcons/sys/dev/drm2/ttm/ttm_bo.c
  user/ed/newcons/sys/dev/e1000/e1000_82575.h
  user/ed/newcons/sys/dev/e1000/e1000_ich8lan.c
  user/ed/newcons/sys/dev/e1000/e1000_regs.h
  user/ed/newcons/sys/dev/etherswitch/arswitch/arswitchreg.h
  user/ed/newcons/sys/dev/ffec/if_ffecreg.h
  user/ed/newcons/sys/dev/firewire/firewire.c
  user/ed/newcons/sys/dev/firewire/fwohci.c
  user/ed/newcons/sys/dev/firewire/fwohcireg.h
  user/ed/newcons/sys/dev/firewire/sbp.c
  user/ed/newcons/sys/dev/firewire/sbp.h
  user/ed/newcons/sys/dev/firewire/sbp_targ.c
  user/ed/newcons/sys/dev/hatm/if_hatmreg.h
  user/ed/newcons/sys/dev/hwpmc/hwpmc_piv.h
  user/ed/newcons/sys/dev/ichsmb/ichsmb_pci.c
  user/ed/newcons/sys/dev/iscsi/iscsi.c
  user/ed/newcons/sys/dev/iwi/if_iwi.c
  user/ed/newcons/sys/dev/iwn/if_iwn.c
  user/ed/newcons/sys/dev/iwn/if_iwn_chip_cfg.h
  user/ed/newcons/sys/dev/iwn/if_iwn_debug.h
  user/ed/newcons/sys/dev/iwn/if_iwnreg.h
  user/ed/newcons/sys/dev/iwn/if_iwnvar.h
  user/ed/newcons/sys/dev/md/md.c
  user/ed/newcons/sys/dev/mge/if_mgevar.h
  user/ed/newcons/sys/dev/mpt/mpt_cam.c
  user/ed/newcons/sys/dev/msk/if_mskreg.h
  user/ed/newcons/sys/dev/mvs/mvs.h
  user/ed/newcons/sys/dev/mxge/mxge_mcp.h
  user/ed/newcons/sys/dev/nand/nand.c
  user/ed/newcons/sys/dev/nand/nand.h
  user/ed/newcons/sys/dev/nand/nand_cdev.c
  user/ed/newcons/sys/dev/nand/nand_generic.c
  user/ed/newcons/sys/dev/nand/nand_geom.c
  user/ed/newcons/sys/dev/nand/nandbus.c
  user/ed/newcons/sys/dev/oce/oce_hw.h
  user/ed/newcons/sys/dev/oce/oce_if.c
  user/ed/newcons/sys/dev/oce/oce_if.h
  user/ed/newcons/sys/dev/oce/oce_mbox.c
  user/ed/newcons/sys/dev/oce/oce_sysctl.c
  user/ed/newcons/sys/dev/ofw/ofw_fdt.c
  user/ed/newcons/sys/dev/qlxgbe/ql_hw.c
  user/ed/newcons/sys/dev/qlxgbe/ql_hw.h
  user/ed/newcons/sys/dev/qlxgbe/ql_ioctl.c
  user/ed/newcons/sys/dev/qlxge/qls_dump.c
  user/ed/newcons/sys/dev/qlxge/qls_ioctl.c
  user/ed/newcons/sys/dev/ral/rt2560reg.h
  user/ed/newcons/sys/dev/ral/rt2661reg.h
  user/ed/newcons/sys/dev/ral/rt2860reg.h
  user/ed/newcons/sys/dev/sfxge/common/efsys.h
  user/ed/newcons/sys/dev/sfxge/common/siena_nic.c
  user/ed/newcons/sys/dev/sound/pci/hda/hdaa.h
  user/ed/newcons/sys/dev/sound/pci/hda/hdac.c
  user/ed/newcons/sys/dev/sound/pci/hda/hdac.h
  user/ed/newcons/sys/dev/sound/pci/hda/hdacc.c
  user/ed/newcons/sys/dev/uart/uart_cpu_powerpc.c
  user/ed/newcons/sys/dev/usb/controller/ehci.h
  user/ed/newcons/sys/dev/usb/controller/ehci_pci.c
  user/ed/newcons/sys/dev/usb/controller/xhci.c
  user/ed/newcons/sys/dev/usb/serial/u3g.c
  user/ed/newcons/sys/dev/usb/usbdevs
  user/ed/newcons/sys/dev/usb/wlan/if_rsu.c
  user/ed/newcons/sys/dev/usb/wlan/if_rum.c
  user/ed/newcons/sys/dev/usb/wlan/if_rumreg.h
  user/ed/newcons/sys/dev/usb/wlan/if_run.c
  user/ed/newcons/sys/dev/usb/wlan/if_runreg.h
  user/ed/newcons/sys/dev/usb/wlan/if_runvar.h
  user/ed/newcons/sys/dev/usb/wlan/if_ural.c
  user/ed/newcons/sys/dev/usb/wlan/if_uralreg.h
  user/ed/newcons/sys/dev/usb/wlan/if_urtw.c
  user/ed/newcons/sys/dev/usb/wlan/if_urtwreg.h
  user/ed/newcons/sys/dev/usb/wlan/if_zydreg.h
  user/ed/newcons/sys/dev/wpi/if_wpireg.h
  user/ed/newcons/sys/dev/xen/balloon/balloon.c
  user/ed/newcons/sys/dev/xen/blkback/blkback.c
  user/ed/newcons/sys/fs/ext2fs/ext2_dinode.h
  user/ed/newcons/sys/fs/nfs/nfs_commonkrpc.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clbio.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clkdtrace.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clnode.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clport.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clsubs.c
  user/ed/newcons/sys/fs/nfsclient/nfs_clvnops.c
  user/ed/newcons/sys/fs/nfsclient/nfs_kdtrace.h
  user/ed/newcons/sys/fs/pseudofs/pseudofs_vnops.c
  user/ed/newcons/sys/geom/geom_disk.c
  user/ed/newcons/sys/geom/geom_dump.c
  user/ed/newcons/sys/geom/geom_int.h
  user/ed/newcons/sys/geom/mirror/g_mirror.c
  user/ed/newcons/sys/geom/mirror/g_mirror_ctl.c
  user/ed/newcons/sys/geom/multipath/g_multipath.c
  user/ed/newcons/sys/geom/multipath/g_multipath.h
  user/ed/newcons/sys/geom/part/g_part_gpt.c
  user/ed/newcons/sys/geom/raid/tr_raid1e.c
  user/ed/newcons/sys/i386/conf/GENERIC
  user/ed/newcons/sys/i386/i386/exception.s
  user/ed/newcons/sys/i386/i386/machdep.c
  user/ed/newcons/sys/i386/i386/trap.c
  user/ed/newcons/sys/i386/include/asm.h
  user/ed/newcons/sys/i386/include/vm86.h
  user/ed/newcons/sys/i386/linux/linux_dummy.c
  user/ed/newcons/sys/i386/linux/linux_sysvec.c
  user/ed/newcons/sys/i386/pci/pci_cfgreg.c
  user/ed/newcons/sys/ia64/conf/GENERIC
  user/ed/newcons/sys/kern/kern_clock.c
  user/ed/newcons/sys/kern/kern_clocksource.c
  user/ed/newcons/sys/kern/kern_descrip.c
  user/ed/newcons/sys/kern/kern_event.c
  user/ed/newcons/sys/kern/kern_exec.c
  user/ed/newcons/sys/kern/kern_exit.c
  user/ed/newcons/sys/kern/kern_fork.c
  user/ed/newcons/sys/kern/kern_jail.c
  user/ed/newcons/sys/kern/kern_lock.c
  user/ed/newcons/sys/kern/kern_lockstat.c
  user/ed/newcons/sys/kern/kern_malloc.c
  user/ed/newcons/sys/kern/kern_mib.c
  user/ed/newcons/sys/kern/kern_mutex.c
  user/ed/newcons/sys/kern/kern_priv.c
  user/ed/newcons/sys/kern/kern_proc.c
  user/ed/newcons/sys/kern/kern_racct.c
  user/ed/newcons/sys/kern/kern_rmlock.c
  user/ed/newcons/sys/kern/kern_rwlock.c
  user/ed/newcons/sys/kern/kern_sdt.c
  user/ed/newcons/sys/kern/kern_shutdown.c
  user/ed/newcons/sys/kern/kern_sig.c
  user/ed/newcons/sys/kern/kern_sx.c
  user/ed/newcons/sys/kern/kern_synch.c
  user/ed/newcons/sys/kern/kern_thread.c
  user/ed/newcons/sys/kern/kern_timeout.c
  user/ed/newcons/sys/kern/makesyscalls.sh
  user/ed/newcons/sys/kern/sched_4bsd.c
  user/ed/newcons/sys/kern/sched_ule.c
  user/ed/newcons/sys/kern/subr_capability.c
  user/ed/newcons/sys/kern/subr_devstat.c
  user/ed/newcons/sys/kern/subr_sleepqueue.c
  user/ed/newcons/sys/kern/subr_syscall.c
  user/ed/newcons/sys/kern/subr_taskqueue.c
  user/ed/newcons/sys/kern/subr_trap.c
  user/ed/newcons/sys/kern/subr_turnstile.c
  user/ed/newcons/sys/kern/sys_generic.c
  user/ed/newcons/sys/kern/sys_procdesc.c
  user/ed/newcons/sys/kern/uipc_mbuf.c
  user/ed/newcons/sys/kern/uipc_mqueue.c
  user/ed/newcons/sys/kern/uipc_syscalls.c
  user/ed/newcons/sys/kern/vfs_bio.c
  user/ed/newcons/sys/kern/vfs_cache.c
  user/ed/newcons/sys/kern/vfs_lookup.c
  user/ed/newcons/sys/kern/vfs_syscalls.c
  user/ed/newcons/sys/kern/vfs_vnops.c
  user/ed/newcons/sys/libkern/iconv.c
  user/ed/newcons/sys/mips/atheros/ar71xxreg.h
  user/ed/newcons/sys/mips/atheros/ar934xreg.h
  user/ed/newcons/sys/mips/atheros/if_argevar.h
  user/ed/newcons/sys/mips/malta/gt_pci.c
  user/ed/newcons/sys/mips/mips/exception.S
  user/ed/newcons/sys/mips/mips/trap.c
  user/ed/newcons/sys/mips/nlm/dev/net/nae.c
  user/ed/newcons/sys/mips/nlm/xlp_machdep.c
  user/ed/newcons/sys/mips/rmi/pic.h
  user/ed/newcons/sys/modules/crypto/Makefile
  user/ed/newcons/sys/modules/ctl/Makefile
  user/ed/newcons/sys/modules/dtrace/dtrace_test/Makefile
  user/ed/newcons/sys/modules/dtrace/lockstat/Makefile
  user/ed/newcons/sys/modules/dtrace/sdt/Makefile
  user/ed/newcons/sys/modules/ip6_mroute_mod/Makefile
  user/ed/newcons/sys/modules/linux/Makefile
  user/ed/newcons/sys/modules/nfscl/Makefile
  user/ed/newcons/sys/modules/nfsclient/Makefile
  user/ed/newcons/sys/modules/nfscommon/Makefile
  user/ed/newcons/sys/modules/send/Makefile
  user/ed/newcons/sys/modules/usb/Makefile
  user/ed/newcons/sys/modules/vmm/Makefile
  user/ed/newcons/sys/net/if_ethersubr.c
  user/ed/newcons/sys/net/if_gif.c
  user/ed/newcons/sys/net/netisr.c
  user/ed/newcons/sys/net/pfvar.h
  user/ed/newcons/sys/net/route.c
  user/ed/newcons/sys/net/vnet.c
  user/ed/newcons/sys/net80211/ieee80211_scan.c
  user/ed/newcons/sys/net80211/ieee80211_scan_sta.c
  user/ed/newcons/sys/netinet/in.c
  user/ed/newcons/sys/netinet/in_kdtrace.c
  user/ed/newcons/sys/netinet/in_kdtrace.h
  user/ed/newcons/sys/netinet/ip_fastfwd.c
  user/ed/newcons/sys/netinet/ip_input.c
  user/ed/newcons/sys/netinet/ip_output.c
  user/ed/newcons/sys/netinet/sctp_bsd_addr.c
  user/ed/newcons/sys/netinet/sctp_dtrace_declare.h
  user/ed/newcons/sys/netinet/sctp_dtrace_define.h
  user/ed/newcons/sys/netinet/sctp_indata.c
  user/ed/newcons/sys/netinet/sctp_output.c
  user/ed/newcons/sys/netinet/sctp_pcb.c
  user/ed/newcons/sys/netinet/tcp_input.c
  user/ed/newcons/sys/netinet/tcp_output.c
  user/ed/newcons/sys/netinet/tcp_subr.c
  user/ed/newcons/sys/netinet/udp_usrreq.c
  user/ed/newcons/sys/netinet6/ip6_input.c
  user/ed/newcons/sys/netinet6/ip6_mroute.c
  user/ed/newcons/sys/netinet6/nd6.c
  user/ed/newcons/sys/netinet6/send.c
  user/ed/newcons/sys/netinet6/udp6_usrreq.c
  user/ed/newcons/sys/netpfil/ipfw/dn_sched.h
  user/ed/newcons/sys/netpfil/ipfw/ip_dn_io.c
  user/ed/newcons/sys/netpfil/ipfw/ip_dn_private.h
  user/ed/newcons/sys/netpfil/ipfw/ip_fw2.c
  user/ed/newcons/sys/netpfil/ipfw/ip_fw_dynamic.c
  user/ed/newcons/sys/netpfil/ipfw/ip_fw_log.c
  user/ed/newcons/sys/netpfil/ipfw/ip_fw_nat.c
  user/ed/newcons/sys/netpfil/ipfw/ip_fw_pfil.c
  user/ed/newcons/sys/netpfil/ipfw/ip_fw_sockopt.c
  user/ed/newcons/sys/netpfil/pf/pf.c
  user/ed/newcons/sys/netpfil/pf/pf_ioctl.c
  user/ed/newcons/sys/netpfil/pf/pf_lb.c
  user/ed/newcons/sys/nfsclient/nfs_bio.c
  user/ed/newcons/sys/nfsclient/nfs_krpc.c
  user/ed/newcons/sys/nfsclient/nfs_subs.c
  user/ed/newcons/sys/nfsclient/nfs_vnops.c
  user/ed/newcons/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  user/ed/newcons/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
  user/ed/newcons/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
  user/ed/newcons/sys/ofed/drivers/net/mlx4/en_netdev.c
  user/ed/newcons/sys/ofed/drivers/net/mlx4/mcg.c
  user/ed/newcons/sys/opencrypto/crypto.c
  user/ed/newcons/sys/opencrypto/deflate.c
  user/ed/newcons/sys/pc98/conf/GENERIC
  user/ed/newcons/sys/pc98/pc98/machdep.c
  user/ed/newcons/sys/powerpc/aim/locore32.S
  user/ed/newcons/sys/powerpc/aim/locore64.S
  user/ed/newcons/sys/powerpc/aim/machdep.c
  user/ed/newcons/sys/powerpc/aim/mmu_oea64.c
  user/ed/newcons/sys/powerpc/aim/trap.c
  user/ed/newcons/sys/powerpc/aim/trap_subr32.S
  user/ed/newcons/sys/powerpc/aim/trap_subr64.S
  user/ed/newcons/sys/powerpc/booke/machdep.c
  user/ed/newcons/sys/powerpc/booke/platform_bare.c
  user/ed/newcons/sys/powerpc/booke/pmap.c
  user/ed/newcons/sys/powerpc/booke/trap.c
  user/ed/newcons/sys/powerpc/conf/GENERIC
  user/ed/newcons/sys/powerpc/fpu/fpu_emu.c
  user/ed/newcons/sys/powerpc/fpu/fpu_explode.c
  user/ed/newcons/sys/powerpc/fpu/fpu_sqrt.c
  user/ed/newcons/sys/powerpc/include/counter.h
  user/ed/newcons/sys/powerpc/include/fdt.h
  user/ed/newcons/sys/powerpc/include/ofw_machdep.h
  user/ed/newcons/sys/powerpc/include/pcb.h
  user/ed/newcons/sys/powerpc/include/trap.h
  user/ed/newcons/sys/powerpc/mpc85xx/mpc85xx.h
  user/ed/newcons/sys/powerpc/mpc85xx/platform_mpc85xx.c
  user/ed/newcons/sys/powerpc/ofw/ofw_machdep.c
  user/ed/newcons/sys/powerpc/ofw/ofw_syscons.c
  user/ed/newcons/sys/powerpc/ofw/rtas.c
  user/ed/newcons/sys/powerpc/powermac/grackle.c
  user/ed/newcons/sys/powerpc/powermac/macio.c
  user/ed/newcons/sys/powerpc/powermac/nvbl.c
  user/ed/newcons/sys/powerpc/powermac/platform_powermac.c
  user/ed/newcons/sys/powerpc/powermac/uninorth.c
  user/ed/newcons/sys/powerpc/powermac/uninorthpci.c
  user/ed/newcons/sys/powerpc/powermac/uninorthvar.h
  user/ed/newcons/sys/powerpc/powerpc/copyinout.c
  user/ed/newcons/sys/powerpc/powerpc/cpu.c
  user/ed/newcons/sys/powerpc/powerpc/exec_machdep.c
  user/ed/newcons/sys/powerpc/powerpc/fpu.c
  user/ed/newcons/sys/powerpc/powerpc/genassym.c
  user/ed/newcons/sys/powerpc/powerpc/platform.c
  user/ed/newcons/sys/powerpc/powerpc/platform_if.m
  user/ed/newcons/sys/powerpc/powerpc/swtch32.S
  user/ed/newcons/sys/powerpc/ps3/platform_ps3.c
  user/ed/newcons/sys/powerpc/pseries/mmu_phyp.c
  user/ed/newcons/sys/powerpc/pseries/phyp_console.c
  user/ed/newcons/sys/powerpc/pseries/platform_chrp.c
  user/ed/newcons/sys/powerpc/pseries/plpar_iommu.c
  user/ed/newcons/sys/powerpc/wii/platform_wii.c
  user/ed/newcons/sys/rpc/auth.h
  user/ed/newcons/sys/rpc/auth_none.c
  user/ed/newcons/sys/rpc/auth_unix.c
  user/ed/newcons/sys/rpc/authunix_prot.c
  user/ed/newcons/sys/rpc/clnt.h
  user/ed/newcons/sys/rpc/clnt_dg.c
  user/ed/newcons/sys/rpc/clnt_vc.c
  user/ed/newcons/sys/rpc/krpc.h
  user/ed/newcons/sys/rpc/nettype.h
  user/ed/newcons/sys/rpc/pmap_prot.h
  user/ed/newcons/sys/rpc/rpc.h
  user/ed/newcons/sys/rpc/rpc_callmsg.c
  user/ed/newcons/sys/rpc/rpc_com.h
  user/ed/newcons/sys/rpc/rpc_generic.c
  user/ed/newcons/sys/rpc/rpc_msg.h
  user/ed/newcons/sys/rpc/rpc_prot.c
  user/ed/newcons/sys/rpc/rpcb_clnt.c
  user/ed/newcons/sys/rpc/rpcb_clnt.h
  user/ed/newcons/sys/rpc/rpcb_prot.c
  user/ed/newcons/sys/rpc/rpcb_prot.h
  user/ed/newcons/sys/rpc/svc.c
  user/ed/newcons/sys/rpc/svc.h
  user/ed/newcons/sys/rpc/svc_auth.c
  user/ed/newcons/sys/rpc/svc_auth.h
  user/ed/newcons/sys/rpc/svc_auth_unix.c
  user/ed/newcons/sys/rpc/svc_dg.c
  user/ed/newcons/sys/rpc/svc_generic.c
  user/ed/newcons/sys/rpc/svc_vc.c
  user/ed/newcons/sys/rpc/types.h
  user/ed/newcons/sys/rpc/xdr.h
  user/ed/newcons/sys/security/mac/mac_audit.c
  user/ed/newcons/sys/security/mac/mac_cred.c
  user/ed/newcons/sys/security/mac/mac_framework.c
  user/ed/newcons/sys/security/mac/mac_inet.c
  user/ed/newcons/sys/security/mac/mac_internal.h
  user/ed/newcons/sys/security/mac/mac_net.c
  user/ed/newcons/sys/security/mac/mac_pipe.c
  user/ed/newcons/sys/security/mac/mac_posix_sem.c
  user/ed/newcons/sys/security/mac/mac_posix_shm.c
  user/ed/newcons/sys/security/mac/mac_priv.c
  user/ed/newcons/sys/security/mac/mac_process.c
  user/ed/newcons/sys/security/mac/mac_socket.c
  user/ed/newcons/sys/security/mac/mac_system.c
  user/ed/newcons/sys/security/mac/mac_sysv_msg.c
  user/ed/newcons/sys/security/mac/mac_sysv_sem.c
  user/ed/newcons/sys/security/mac/mac_sysv_shm.c
  user/ed/newcons/sys/security/mac/mac_vfs.c
  user/ed/newcons/sys/sparc64/conf/GENERIC
  user/ed/newcons/sys/sys/bufobj.h
  user/ed/newcons/sys/sys/capability.h
  user/ed/newcons/sys/sys/consio.h
  user/ed/newcons/sys/sys/file.h
  user/ed/newcons/sys/sys/ktr.h
  user/ed/newcons/sys/sys/lock.h
  user/ed/newcons/sys/sys/mdioctl.h
  user/ed/newcons/sys/sys/mutex.h
  user/ed/newcons/sys/sys/param.h
  user/ed/newcons/sys/sys/rwlock.h
  user/ed/newcons/sys/sys/sdt.h
  user/ed/newcons/sys/sys/sx.h
  user/ed/newcons/sys/sys/sysctl.h
  user/ed/newcons/sys/sys/taskqueue.h
  user/ed/newcons/sys/sys/user.h
  user/ed/newcons/sys/tools/vnode_if.awk
  user/ed/newcons/sys/ufs/ffs/ffs_softdep.c
  user/ed/newcons/sys/ufs/ffs/softdep.h
  user/ed/newcons/sys/vm/uma_core.c
  user/ed/newcons/sys/vm/uma_int.h
  user/ed/newcons/sys/vm/vm_fault.c
  user/ed/newcons/sys/vm/vm_map.c
  user/ed/newcons/sys/x86/include/psl.h
  user/ed/newcons/sys/x86/iommu/intel_reg.h
  user/ed/newcons/sys/x86/x86/local_apic.c
  user/ed/newcons/tools/build/mk/OptionalObsoleteFiles.inc
  user/ed/newcons/tools/build/options/WITHOUT_PKGBOOTSTRAP
  user/ed/newcons/tools/regression/fsx/fsx.c
  user/ed/newcons/tools/regression/usr.sbin/etcupdate/fbsdid.sh
  user/ed/newcons/tools/test/dtrace/Makefile
  user/ed/newcons/tools/tools/bus_autoconf/bus_autoconf.sh
  user/ed/newcons/tools/tools/cxgbetool/Makefile
  user/ed/newcons/tools/tools/cxgbetool/cxgbetool.c
  user/ed/newcons/tools/tools/nanobsd/nanobsd.sh
  user/ed/newcons/tools/tools/umastat/umastat.c
  user/ed/newcons/tools/tools/zfsboottest/Makefile
  user/ed/newcons/usr.bin/cmp/cmp.1
  user/ed/newcons/usr.bin/from/from.c
  user/ed/newcons/usr.bin/login/login.c
  user/ed/newcons/usr.bin/procstat/procstat_files.c
  user/ed/newcons/usr.bin/svn/svn_private_config.h
  user/ed/newcons/usr.bin/uname/uname.1
  user/ed/newcons/usr.bin/yacc/Makefile
  user/ed/newcons/usr.sbin/acpi/acpidump/acpi.c
  user/ed/newcons/usr.sbin/bhyve/acpi.c
  user/ed/newcons/usr.sbin/bhyve/mptbl.c
  user/ed/newcons/usr.sbin/bhyve/pci_ahci.c
  user/ed/newcons/usr.sbin/bhyve/pci_emul.c
  user/ed/newcons/usr.sbin/bhyve/pci_emul.h
  user/ed/newcons/usr.sbin/bhyve/pci_lpc.c
  user/ed/newcons/usr.sbin/bhyve/pit_8254.c
  user/ed/newcons/usr.sbin/bhyve/uart_emul.c
  user/ed/newcons/usr.sbin/bhyveload/bhyveload.8
  user/ed/newcons/usr.sbin/bhyveload/bhyveload.c
  user/ed/newcons/usr.sbin/bluetooth/bthidd/kbd.c
  user/ed/newcons/usr.sbin/bsdconfig/Makefile
  user/ed/newcons/usr.sbin/bsdconfig/console/include/messages.subr
  user/ed/newcons/usr.sbin/bsdconfig/console/ttys
  user/ed/newcons/usr.sbin/bsdconfig/dot/dot
  user/ed/newcons/usr.sbin/bsdconfig/include/messages.subr
  user/ed/newcons/usr.sbin/bsdconfig/mouse/include/messages.subr
  user/ed/newcons/usr.sbin/bsdconfig/networking/devices
  user/ed/newcons/usr.sbin/bsdconfig/networking/include/messages.subr
  user/ed/newcons/usr.sbin/bsdconfig/networking/share/device.subr
  user/ed/newcons/usr.sbin/bsdconfig/packages/packages
  user/ed/newcons/usr.sbin/bsdconfig/share/common.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/device.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/media/cdrom.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/media/http.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/media/tcpip.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/packages/index.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/packages/packages.subr
  user/ed/newcons/usr.sbin/bsdconfig/share/variable.subr
  user/ed/newcons/usr.sbin/bsdconfig/startup/include/messages.subr
  user/ed/newcons/usr.sbin/bsdconfig/usermgmt/include/messages.subr
  user/ed/newcons/usr.sbin/bsdinstall/scripts/zfsboot
  user/ed/newcons/usr.sbin/ctld/ctl.conf.5
  user/ed/newcons/usr.sbin/ctld/parse.y
  user/ed/newcons/usr.sbin/etcupdate/etcupdate.sh
  user/ed/newcons/usr.sbin/iostat/iostat.c
  user/ed/newcons/usr.sbin/makefs/ffs.c
  user/ed/newcons/usr.sbin/mergemaster/mergemaster.sh
  user/ed/newcons/usr.sbin/mfiutil/mfi_show.c
  user/ed/newcons/usr.sbin/pkg/pkg.7
  user/ed/newcons/usr.sbin/pkg/pkg.c
  user/ed/newcons/usr.sbin/portsnap/portsnap/portsnap.sh
  user/ed/newcons/usr.sbin/rpcbind/check_bound.c
  user/ed/newcons/usr.sbin/rpcbind/pmap_svc.c
  user/ed/newcons/usr.sbin/rpcbind/rpcb_stat.c
  user/ed/newcons/usr.sbin/rpcbind/rpcb_svc.c
  user/ed/newcons/usr.sbin/rpcbind/rpcb_svc_4.c
  user/ed/newcons/usr.sbin/rpcbind/rpcb_svc_com.c
  user/ed/newcons/usr.sbin/rpcbind/rpcbind.c
  user/ed/newcons/usr.sbin/rpcbind/rpcbind.h
  user/ed/newcons/usr.sbin/rpcbind/warmstart.c
  user/ed/newcons/usr.sbin/rwhod/rwhod.c
  user/ed/newcons/usr.sbin/sysrc/sysrc.8
  user/ed/newcons/usr.sbin/wpa/ndis_events/ndis_events.8
Directory Properties:
  user/ed/newcons/   (props changed)
  user/ed/newcons/cddl/   (props changed)
  user/ed/newcons/cddl/contrib/opensolaris/   (props changed)
  user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  user/ed/newcons/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/ed/newcons/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/ed/newcons/contrib/apr-util/   (props changed)
  user/ed/newcons/contrib/atf/   (props changed)
  user/ed/newcons/contrib/bmake/   (props changed)
  user/ed/newcons/contrib/gcc/   (props changed)
  user/ed/newcons/contrib/gdb/   (props changed)
  user/ed/newcons/contrib/libexecinfo/   (props changed)
  user/ed/newcons/contrib/libstdc++/   (props changed)
  user/ed/newcons/contrib/llvm/   (props changed)
  user/ed/newcons/contrib/llvm/tools/clang/   (props changed)
  user/ed/newcons/contrib/llvm/tools/lldb/   (props changed)
  user/ed/newcons/contrib/mtree/   (props changed)
  user/ed/newcons/contrib/netcat/   (props changed)
  user/ed/newcons/contrib/subversion/   (props changed)
  user/ed/newcons/contrib/tcpdump/   (props changed)
  user/ed/newcons/gnu/usr.bin/cc/cc_tools/   (props changed)
  user/ed/newcons/lib/libc/   (props changed)
  user/ed/newcons/lib/libvmmapi/   (props changed)
  user/ed/newcons/sbin/   (props changed)
  user/ed/newcons/sbin/ipfw/   (props changed)
  user/ed/newcons/share/man/man4/   (props changed)
  user/ed/newcons/sys/   (props changed)
  user/ed/newcons/sys/amd64/vmm/   (props changed)
  user/ed/newcons/sys/boot/   (props changed)
  user/ed/newcons/sys/boot/i386/efi/   (props changed)
  user/ed/newcons/sys/cddl/contrib/opensolaris/   (props changed)
  user/ed/newcons/sys/conf/   (props changed)
  user/ed/newcons/sys/modules/vmm/   (props changed)
  user/ed/newcons/usr.bin/procstat/   (props changed)
  user/ed/newcons/usr.sbin/bhyve/   (props changed)
  user/ed/newcons/usr.sbin/bhyveload/   (props changed)

Modified: user/ed/newcons/Makefile.inc1
==============================================================================
--- user/ed/newcons/Makefile.inc1	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/Makefile.inc1	Thu Dec  5 00:57:53 2013	(r258951)
@@ -509,7 +509,7 @@ _worldtmp:
 .endif
 .if ${MK_TESTS} != "no"
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
-	    -p ${WORLDTMP}${TESTSBASE} >/dev/null
+	    -p ${WORLDTMP}/usr >/dev/null
 .endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
@@ -1475,11 +1475,13 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARC
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
+_startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
+gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
@@ -1497,13 +1499,14 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
-		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
+		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
+		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libzfs_core} \
-		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
+		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
@@ -1519,6 +1522,13 @@ _lib_libthr=	lib/libthr
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
+.if ${MK_CASPER} != "no"
+_lib_libcapsicum=lib/libcapsicum
+.endif
+
+lib/libcapsicum__L: lib/libnv__L
+lib/libpjdlog__L: lib/libutil__L
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)

Modified: user/ed/newcons/ObsoleteFiles.inc
==============================================================================
--- user/ed/newcons/ObsoleteFiles.inc	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/ObsoleteFiles.inc	Thu Dec  5 00:57:53 2013	(r258951)
@@ -38,18 +38,28 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131202: libcapsicum and libcasper moved to /lib/
+OLD_LIBS+=usr/lib/libcapsicum.so.0
+OLD_LIBS+=usr/lib/libcasper.so.0
 # 20131109: extattr(2) mlinks fixed
 OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
 OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
 # 20131107: example files removed
 OLD_FILES+=usr/share/examples/libusb20/aux.c
 OLD_FILES+=usr/share/examples/libusb20/aux.h
+# 20131105: tzdata 2013h import
+OLD_FILES+=usr/share/zoneinfo/America/Shiprock
+OLD_FILES+=usr/share/zoneinfo/Antarctica/South_Pole
 # 20131103: WITH_LIBICONV_COMPAT removal
 OLD_FILES+=usr/include/_libiconv_compat.h
 OLD_FILES+=usr/lib/libiconv.a
 OLD_FILES+=usr/lib/libiconv.so
 OLD_FILES+=usr/lib/libiconv.so.3
 OLD_FILES+=usr/lib/libiconv_p.a
+OLD_FILES+=usr/lib32/libiconv.a
+OLD_FILES+=usr/lib32/libiconv.so
+OLD_FILES+=usr/lib32/libiconv.so.3
+OLD_FILES+=usr/lib32/libiconv_p.a
 # 20131103: removal of utxrm(8), use 'utx rm' instead.
 OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man8/utxrm.8.gz
@@ -79,8 +89,14 @@ OLD_FILES+=etc/keys/pkg/trusted/pkg.free
 # 20131028: ng_fec(4) removed
 OLD_FILES+=usr/include/netgraph/ng_fec.h
 OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
+# 20131027: header moved
+OLD_FILES+=usr/include/net/pf_mtag.h
 # 20131023: remove never used iscsi directory
 OLD_DIRS+=usr/share/examples/iscsi
+# 20131021: isf(4) removed
+OLD_FILES+=usr/sbin/isfctl
+OLD_FILES+=usr/share/man/man4/isf.4.gz
+OLD_FILES+=usr/share/man/man8/isfctl.8.gz
 # 20131014: libbsdyml becomes private
 OLD_FILES+=usr/lib/libbsdyml.a
 OLD_FILES+=usr/lib/libbsdyml.so
@@ -119,6 +135,7 @@ OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
+OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig

Modified: user/ed/newcons/UPDATING
==============================================================================
--- user/ed/newcons/UPDATING	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/UPDATING	Thu Dec  5 00:57:53 2013	(r258951)
@@ -76,7 +76,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	BIND has been removed from the base system.  If all you need
 	is a local resolver, simply enable and start the local_unbound
 	service instead.  Otherwise, several versions of BIND are
-	available in the ports tree.
+	available in the ports tree.   The dns/bind99 port is one example.
+
+	With this change, nslookup(1) and dig(1) are no longer in the base
+	system.  Users should instead use host(1) and drill(1) which are
+	in the base system.  Alternatively, nslookup and dig can
+	be obtained by installing the dns/bind-tools port.
 
 20130916:
 	With the addition of unbound(8), a new unbound user is now

Modified: user/ed/newcons/bin/sh/cd.c
==============================================================================
--- user/ed/newcons/bin/sh/cd.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/cd.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -182,6 +182,7 @@ cdlogical(char *dest)
 	struct stat statb;
 	int first;
 	int badstat;
+	size_t len;
 
 	/*
 	 *  Check each component of the path. If we find a symlink or
@@ -189,8 +190,9 @@ cdlogical(char *dest)
 	 *  next time we get the value of the current directory.
 	 */
 	badstat = 0;
-	cdcomppath = stalloc(strlen(dest) + 1);
-	scopy(dest, cdcomppath);
+	len = strlen(dest);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dest, len + 1);
 	STARTSTACKSTR(p);
 	if (*dest == '/') {
 		STPUTC('/', p);
@@ -275,6 +277,7 @@ findcwd(char *dir)
 {
 	char *new;
 	char *p;
+	size_t len;
 
 	/*
 	 * If our argument is NULL, we don't know the current directory
@@ -283,8 +286,9 @@ findcwd(char *dir)
 	 */
 	if (dir == NULL || curdir == NULL)
 		return getpwd2();
-	cdcomppath = stalloc(strlen(dir) + 1);
-	scopy(dir, cdcomppath);
+	len = strlen(dir);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dir, len + 1);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		STPUTS(curdir, new);

Modified: user/ed/newcons/bin/sh/exec.c
==============================================================================
--- user/ed/newcons/bin/sh/exec.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/exec.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -187,14 +187,15 @@ padvance(const char **path, const char *
 {
 	const char *p, *start;
 	char *q;
-	size_t len;
+	size_t len, namelen;
 
 	if (*path == NULL)
 		return NULL;
 	start = *path;
 	for (p = start; *p && *p != ':' && *p != '%'; p++)
 		; /* nothing */
-	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
+	namelen = strlen(name);
+	len = p - start + namelen + 2;	/* "2" is for '/' and '\0' */
 	STARTSTACKSTR(q);
 	CHECKSTRSPACE(len, q);
 	if (p != start) {
@@ -202,7 +203,7 @@ padvance(const char **path, const char *
 		q += p - start;
 		*q++ = '/';
 	}
-	strcpy(q, name);
+	memcpy(q, name, namelen + 1);
 	pathopt = NULL;
 	if (*p == '%') {
 		pathopt = ++p;
@@ -527,6 +528,7 @@ cmdlookup(const char *name, int add)
 	const char *p;
 	struct tblentry *cmdp;
 	struct tblentry **pp;
+	size_t len;
 
 	p = name;
 	hashval = *p << 4;
@@ -541,11 +543,11 @@ cmdlookup(const char *name, int add)
 	}
 	if (add && cmdp == NULL) {
 		INTOFF;
-		cmdp = *pp = ckmalloc(sizeof (struct tblentry)
-					+ strlen(name) + 1);
+		len = strlen(name);
+		cmdp = *pp = ckmalloc(sizeof (struct tblentry) + len + 1);
 		cmdp->next = NULL;
 		cmdp->cmdtype = CMDUNKNOWN;
-		strcpy(cmdp->cmdname, name);
+		memcpy(cmdp->cmdname, name, len + 1);
 		INTON;
 	}
 	lastcmdentry = pp;

Modified: user/ed/newcons/bin/sh/expand.c
==============================================================================
--- user/ed/newcons/bin/sh/expand.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/expand.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -1307,9 +1307,11 @@ addfname(char *name)
 {
 	char *p;
 	struct strlist *sp;
+	size_t len;
 
-	p = stalloc(strlen(name) + 1);
-	scopy(name, p);
+	len = strlen(name);
+	p = stalloc(len + 1);
+	memcpy(p, name, len + 1);
 	sp = (struct strlist *)stalloc(sizeof *sp);
 	sp->text = p;
 	*exparg.lastp = sp;

Modified: user/ed/newcons/bin/sh/memalloc.c
==============================================================================
--- user/ed/newcons/bin/sh/memalloc.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/memalloc.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -98,9 +98,11 @@ char *
 savestr(const char *s)
 {
 	char *p;
+	size_t len;
 
-	p = ckmalloc(strlen(s) + 1);
-	scopy(s, p);
+	len = strlen(s);
+	p = ckmalloc(len + 1);
+	memcpy(p, s, len + 1);
 	return p;
 }
 

Modified: user/ed/newcons/bin/sh/mystring.c
==============================================================================
--- user/ed/newcons/bin/sh/mystring.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/mystring.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
  * String functions.
  *
  *	equal(s1, s2)		Return true if strings are equal.
- *	scopy(from, to)		Copy a string.
  *	number(s)		Convert a string of digits to an integer.
  *	is_number(s)		Return true if s is a string of digits.
  */
@@ -60,10 +59,6 @@ char nullstr[1];		/* zero length string 
  * equal - #defined in mystring.h
  */
 
-/*
- * scopy - #defined in mystring.h
- */
-
 
 /*
  * prefix -- see if pfx is a prefix of string.

Modified: user/ed/newcons/bin/sh/mystring.h
==============================================================================
--- user/ed/newcons/bin/sh/mystring.h	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/mystring.h	Thu Dec  5 00:57:53 2013	(r258951)
@@ -40,4 +40,3 @@ int number(const char *);
 int is_number(const char *);
 
 #define equal(s1, s2)	(strcmp(s1, s2) == 0)
-#define scopy(s1, s2)	((void)strcpy(s2, s1))

Modified: user/ed/newcons/bin/sh/redir.c
==============================================================================
--- user/ed/newcons/bin/sh/redir.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/redir.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
+	int fd0_redirected;
 };
 
 
@@ -109,11 +110,14 @@ redirect(union node *redir, int flags)
 		sv = ckmalloc(sizeof (struct redirtab));
 		for (i = 0 ; i < 10 ; i++)
 			sv->renamed[i] = EMPTY;
+		sv->fd0_redirected = fd0_redirected;
 		sv->next = redirlist;
 		redirlist = sv;
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
+		if (fd == 0)
+			fd0_redirected = 1;
 		if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
 		    n->ndup.dupfd == fd)
 			continue; /* redirect from/to same file descriptor */
@@ -134,8 +138,6 @@ redirect(union node *redir, int flags)
 			sv->renamed[fd] = i;
 			INTON;
 		}
-		if (fd == 0)
-			fd0_redirected++;
 		openredirect(n, memory);
 	}
 	if (memory[1])
@@ -303,8 +305,6 @@ popredir(void)
 
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
-                        if (i == 0)
-                                fd0_redirected--;
 			if (rp->renamed[i] >= 0) {
 				dup2(rp->renamed[i], i);
 				close(rp->renamed[i]);
@@ -314,6 +314,7 @@ popredir(void)
 		}
 	}
 	INTOFF;
+	fd0_redirected = rp->fd0_redirected;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;

Modified: user/ed/newcons/bin/sh/show.c
==============================================================================
--- user/ed/newcons/bin/sh/show.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/show.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -390,11 +390,11 @@ opentrace(void)
 			else
 				p = "/tmp";
 		}
-		scopy(p, s);
+		strcpy(s, p);
 		strcat(s, "/trace");
 	}
 #else
-	scopy("./trace", s);
+	strcpy(s, "./trace");
 #endif /* not_this_way */
 	if ((tracefile = fopen(s, "a")) == NULL) {
 		fprintf(stderr, "Can't open %s: %s\n", s, strerror(errno));

Modified: user/ed/newcons/bin/sh/var.c
==============================================================================
--- user/ed/newcons/bin/sh/var.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/sh/var.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -224,8 +224,9 @@ void
 setvar(const char *name, const char *val, int flags)
 {
 	const char *p;
-	int len;
-	int namelen;
+	size_t len;
+	size_t namelen;
+	size_t vallen;
 	char *nameeq;
 	int isbad;
 
@@ -244,18 +245,20 @@ setvar(const char *name, const char *val
 	}
 	namelen = p - name;
 	if (isbad)
-		error("%.*s: bad variable name", namelen, name);
+		error("%.*s: bad variable name", (int)namelen, name);
 	len = namelen + 2;		/* 2 is space for '=' and '\0' */
 	if (val == NULL) {
 		flags |= VUNSET;
+		vallen = 0;
 	} else {
-		len += strlen(val);
+		vallen = strlen(val);
+		len += vallen;
 	}
 	nameeq = ckmalloc(len);
 	memcpy(nameeq, name, namelen);
 	nameeq[namelen] = '=';
 	if (val)
-		scopy(val, nameeq + namelen + 1);
+		memcpy(nameeq + namelen + 1, val, vallen + 1);
 	else
 		nameeq[namelen + 1] = '\0';
 	setvareq(nameeq, flags);

Modified: user/ed/newcons/bin/test/test.c
==============================================================================
--- user/ed/newcons/bin/test/test.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/bin/test/test.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -67,9 +67,18 @@ error(const char *msg, ...)
 	operand ::= <any legal UNIX file name>
 */
 
+enum token_types {
+	UNOP = 0x100,
+	BINOP = 0x200,
+	BUNOP = 0x300,
+	BBINOP = 0x400,
+	PAREN = 0x500
+};
+
 enum token {
 	EOI,
-	FILRD,
+	OPERAND,
+	FILRD = UNOP + 1,
 	FILWR,
 	FILEX,
 	FILEXIST,
@@ -85,13 +94,13 @@ enum token {
 	FILSUID,
 	FILSGID,
 	FILSTCK,
-	FILNT,
-	FILOT,
-	FILEQ,
-	FILUID,
-	FILGID,
 	STREZ,
 	STRNZ,
+	FILUID,
+	FILGID,
+	FILNT = BINOP + 1,
+	FILOT,
+	FILEQ,
 	STREQ,
 	STRNE,
 	STRLT,
@@ -102,70 +111,62 @@ enum token {
 	INTGT,
 	INTLE,
 	INTLT,
-	UNOT,
-	BAND,
+	UNOT = BUNOP + 1,
+	BAND = BBINOP + 1,
 	BOR,
-	LPAREN,
-	RPAREN,
-	OPERAND
+	LPAREN = PAREN + 1,
+	RPAREN
 };
 
-enum token_types {
-	UNOP,
-	BINOP,
-	BUNOP,
-	BBINOP,
-	PAREN
-};
+#define TOKEN_TYPE(token) ((token) & 0xff00)
 
 static struct t_op {
 	char op_text[4];
-	short op_num, op_type;
+	short op_num;
 } const ops [] = {
-	{"-r",	FILRD,	UNOP},
-	{"-w",	FILWR,	UNOP},
-	{"-x",	FILEX,	UNOP},
-	{"-e",	FILEXIST,UNOP},
-	{"-f",	FILREG,	UNOP},
-	{"-d",	FILDIR,	UNOP},
-	{"-c",	FILCDEV,UNOP},
-	{"-b",	FILBDEV,UNOP},
-	{"-p",	FILFIFO,UNOP},
-	{"-u",	FILSUID,UNOP},
-	{"-g",	FILSGID,UNOP},
-	{"-k",	FILSTCK,UNOP},
-	{"-s",	FILGZ,	UNOP},
-	{"-t",	FILTT,	UNOP},
-	{"-z",	STREZ,	UNOP},
-	{"-n",	STRNZ,	UNOP},
-	{"-h",	FILSYM,	UNOP},		/* for backwards compat */
-	{"-O",	FILUID,	UNOP},
-	{"-G",	FILGID,	UNOP},
-	{"-L",	FILSYM,	UNOP},
-	{"-S",	FILSOCK,UNOP},
-	{"=",	STREQ,	BINOP},
-	{"==",	STREQ,	BINOP},
-	{"!=",	STRNE,	BINOP},
-	{"<",	STRLT,	BINOP},
-	{">",	STRGT,	BINOP},
-	{"-eq",	INTEQ,	BINOP},
-	{"-ne",	INTNE,	BINOP},
-	{"-ge",	INTGE,	BINOP},
-	{"-gt",	INTGT,	BINOP},
-	{"-le",	INTLE,	BINOP},
-	{"-lt",	INTLT,	BINOP},
-	{"-nt",	FILNT,	BINOP},
-	{"-ot",	FILOT,	BINOP},
-	{"-ef",	FILEQ,	BINOP},
-	{"!",	UNOT,	BUNOP},
-	{"-a",	BAND,	BBINOP},
-	{"-o",	BOR,	BBINOP},
-	{"(",	LPAREN,	PAREN},
-	{")",	RPAREN,	PAREN},
-	{"",	0,	0}
+	{"-r",	FILRD},
+	{"-w",	FILWR},
+	{"-x",	FILEX},
+	{"-e",	FILEXIST},
+	{"-f",	FILREG},
+	{"-d",	FILDIR},
+	{"-c",	FILCDEV},
+	{"-b",	FILBDEV},
+	{"-p",	FILFIFO},
+	{"-u",	FILSUID},
+	{"-g",	FILSGID},
+	{"-k",	FILSTCK},
+	{"-s",	FILGZ},
+	{"-t",	FILTT},
+	{"-z",	STREZ},
+	{"-n",	STRNZ},
+	{"-h",	FILSYM},		/* for backwards compat */
+	{"-O",	FILUID},
+	{"-G",	FILGID},
+	{"-L",	FILSYM},
+	{"-S",	FILSOCK},
+	{"=",	STREQ},
+	{"==",	STREQ},
+	{"!=",	STRNE},
+	{"<",	STRLT},
+	{">",	STRGT},
+	{"-eq",	INTEQ},
+	{"-ne",	INTNE},
+	{"-ge",	INTGE},
+	{"-gt",	INTGT},
+	{"-le",	INTLE},
+	{"-lt",	INTLT},
+	{"-nt",	FILNT},
+	{"-ot",	FILOT},
+	{"-ef",	FILEQ},
+	{"!",	UNOT},
+	{"-a",	BAND},
+	{"-o",	BOR},
+	{"(",	LPAREN},
+	{")",	RPAREN},
+	{"",	0}
 };
 
-static struct t_op const *t_wp_op;
 static int nargc;
 static char **t_wp;
 static int parenlevel;
@@ -295,10 +296,10 @@ primary(enum token n)
 		parenlevel--;
 		return res;
 	}
-	if (t_wp_op && t_wp_op->op_type == UNOP) {
+	if (TOKEN_TYPE(n) == UNOP) {
 		/* unary expression */
 		if (--nargc == 0)
-			syntax(t_wp_op->op_text, "argument expected");
+			syntax(NULL, "argument expected"); /* impossible */
 		switch (n) {
 		case STREZ:
 			return strlen(*++t_wp) == 0;
@@ -311,10 +312,8 @@ primary(enum token n)
 		}
 	}
 
-	if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type ==
-	    BINOP) {
+	if (TOKEN_TYPE(t_lex(nargc > 0 ? t_wp[1] : NULL)) == BINOP)
 		return binop();
-	}
 
 	return strlen(*t_wp) > 0;
 }
@@ -322,17 +321,17 @@ primary(enum token n)
 static int
 binop(void)
 {
-	const char *opnd1, *opnd2;
-	struct t_op const *op;
+	const char *opnd1, *op, *opnd2;
+	enum token n;
 
 	opnd1 = *t_wp;
-	(void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
-	op = t_wp_op;
+	op = nargc > 0 ? t_wp[1] : NULL;
+	n = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
 
 	if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL)
-		syntax(op->op_text, "argument expected");
+		syntax(op, "argument expected");
 
-	switch (op->op_num) {
+	switch (n) {
 	case STREQ:
 		return strcmp(opnd1, opnd2) == 0;
 	case STRNE:
@@ -424,22 +423,20 @@ t_lex(char *s)
 	struct t_op const *op = ops;
 
 	if (s == 0) {
-		t_wp_op = NULL;
 		return EOI;
 	}
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
-			if (((op->op_type == UNOP || op->op_type == BUNOP)
+			if (((TOKEN_TYPE(op->op_num) == UNOP ||
+			    TOKEN_TYPE(op->op_num) == BUNOP)
 						&& isunopoperand()) ||
 			    (op->op_num == LPAREN && islparenoperand()) ||
 			    (op->op_num == RPAREN && isrparenoperand()))
 				break;
-			t_wp_op = op;
 			return op->op_num;
 		}
 		op++;
 	}
-	t_wp_op = NULL;
 	return OPERAND;
 }
 
@@ -458,7 +455,7 @@ isunopoperand(void)
 	t = *(t_wp + 2);
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
-			return op->op_type == BINOP &&
+			return TOKEN_TYPE(op->op_num) == BINOP &&
 			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 		op++;
 	}
@@ -480,7 +477,7 @@ islparenoperand(void)
 		return 0;
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
-			return op->op_type == BINOP;
+			return TOKEN_TYPE(op->op_num) == BINOP;
 		op++;
 	}
 	return 0;

Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
==============================================================================
--- user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh	Thu Dec  5 00:57:53 2013	(r258951)
@@ -64,7 +64,7 @@ child=$!
 # ksh doing work.  (This actually goes one step further and assumes that we
 # catch some non-static function in ksh.)
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child

Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
==============================================================================
--- user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh	Thu Dec  5 00:57:53 2013	(r258951)
@@ -62,7 +62,7 @@ child=$!
 #
 # The only thing we can be sure of here is that ksh is doing some work.
 #
-script | tee /dev/fd/2 | grep -w ksh > /dev/null
+script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null
 status=$? 
 
 kill $child

Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
==============================================================================
--- user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh	Thu Dec  5 00:57:53 2013	(r258951)
@@ -63,7 +63,7 @@ child=$!
 # This test is essentially the same as that in the ufunc test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child

Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
==============================================================================
--- user/ed/newcons/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -778,7 +778,8 @@ main(int argc, char **argv)
 #endif
 	int err;
 	int opt_C = 0, opt_H = 0, opt_p = 0, opt_v = 0;
-	char c, *p, *end;
+	int c;
+	char *p, *end;
 	struct sigaction act;
 	int done = 0;
 

Modified: user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Thu Dec  5 00:56:50 2013	(r258950)
+++ user/ed/newcons/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Thu Dec  5 00:57:53 2013	(r258951)
@@ -242,7 +242,7 @@ const char histo_stars[] = "************
 const int histo_width = sizeof (histo_stars) - 1;
 
 static void
-dump_histogram(const uint64_t *histo, int size)
+dump_histogram(const uint64_t *histo, int size, int offset)
 {
 	int i;
 	int minidx = size - 1;
@@ -263,7 +263,7 @@ dump_histogram(const uint64_t *histo, in
 
 	for (i = minidx; i <= maxidx; i++) {
 		(void) printf("\t\t\t%3u: %6llu %s\n",
-		    i, (u_longlong_t)histo[i],
+		    i + offset, (u_longlong_t)histo[i],
 		    &histo_stars[(max - histo[i]) * histo_width / max]);
 	}
 }
@@ -316,19 +316,19 @@ dump_zap_stats(objset_t *os, uint64_t ob
 	    (u_longlong_t)zs.zs_salt);
 
 	(void) printf("\t\tLeafs with 2^n pointers:\n");
-	dump_histogram(zs.zs_leafs_with_2n_pointers, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_leafs_with_2n_pointers, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBlocks with n*5 entries:\n");
-	dump_histogram(zs.zs_blocks_with_n5_entries, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_blocks_with_n5_entries, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBlocks n/10 full:\n");
-	dump_histogram(zs.zs_blocks_n_tenths_full, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_blocks_n_tenths_full, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tEntries with n chunks:\n");
-	dump_histogram(zs.zs_entries_using_n_chunks, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_entries_using_n_chunks, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBuckets with n entries:\n");
-	dump_histogram(zs.zs_buckets_with_n_entries, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_buckets_with_n_entries, ZAP_HISTOGRAM_SIZE, 0);
 }
 
 /*ARGSUSED*/
@@ -517,26 +517,85 @@ dump_zpldir(objset_t *os, uint64_t objec
 	zap_cursor_fini(&zc);
 }
 
+int
+get_dtl_refcount(vdev_t *vd)
+{
+	int refcount = 0;
+
+	if (vd->vdev_ops->vdev_op_leaf) {
+		space_map_t *sm = vd->vdev_dtl_sm;
+
+		if (sm != NULL &&
+		    sm->sm_dbuf->db_size == sizeof (space_map_phys_t))
+			return (1);
+		return (0);
+	}
+
+	for (int c = 0; c < vd->vdev_children; c++)
+		refcount += get_dtl_refcount(vd->vdev_child[c]);
+	return (refcount);
+}
+
+int
+get_metaslab_refcount(vdev_t *vd)
+{
+	int refcount = 0;
+
+	if (vd->vdev_top == vd) {
+		for (int m = 0; m < vd->vdev_ms_count; m++) {
+			space_map_t *sm = vd->vdev_ms[m]->ms_sm;
+
+			if (sm != NULL &&
+			    sm->sm_dbuf->db_size == sizeof (space_map_phys_t))
+				refcount++;
+		}
+	}
+	for (int c = 0; c < vd->vdev_children; c++)
+		refcount += get_metaslab_refcount(vd->vdev_child[c]);
+
+	return (refcount);
+}
+
+static int
+verify_spacemap_refcounts(spa_t *spa)
+{
+	int expected_refcount, actual_refcount;
+
+	expected_refcount = spa_feature_get_refcount(spa,
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]);
+	actual_refcount = get_dtl_refcount(spa->spa_root_vdev);
+	actual_refcount += get_metaslab_refcount(spa->spa_root_vdev);
+
+	if (expected_refcount != actual_refcount) {
+		(void) printf("space map refcount mismatch: expected %d != "
+		    "actual %d\n", expected_refcount, actual_refcount);
+		return (2);
+	}
+	return (0);
+}
+
 static void
-dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm)
+dump_spacemap(objset_t *os, space_map_t *sm)
 {
 	uint64_t alloc, offset, entry;
-	uint8_t mapshift = sm->sm_shift;
-	uint64_t mapstart = sm->sm_start;
 	char *ddata[] = { "ALLOC", "FREE", "CONDENSE", "INVALID",
 			    "INVALID", "INVALID", "INVALID", "INVALID" };
 
-	if (smo->smo_object == 0)
+	if (sm == NULL)
 		return;
 
 	/*
 	 * Print out the freelist entries in both encoded and decoded form.
 	 */
 	alloc = 0;
-	for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) {
-		VERIFY3U(0, ==, dmu_read(os, smo->smo_object, offset,
+	for (offset = 0; offset < space_map_length(sm);
+	    offset += sizeof (entry)) {
+		uint8_t mapshift = sm->sm_shift;
+
+		VERIFY0(dmu_read(os, space_map_object(sm), offset,
 		    sizeof (entry), &entry, DMU_READ_PREFETCH));
 		if (SM_DEBUG_DECODE(entry)) {
+
 			(void) printf("\t    [%6llu] %s: txg %llu, pass %llu\n",
 			    (u_longlong_t)(offset / sizeof (entry)),
 			    ddata[SM_DEBUG_ACTION_DECODE(entry)],
@@ -548,10 +607,10 @@ dump_spacemap(objset_t *os, space_map_ob
 			    (u_longlong_t)(offset / sizeof (entry)),
 			    SM_TYPE_DECODE(entry) == SM_ALLOC ? 'A' : 'F',
 			    (u_longlong_t)((SM_OFFSET_DECODE(entry) <<
-			    mapshift) + mapstart),
+			    mapshift) + sm->sm_start),
 			    (u_longlong_t)((SM_OFFSET_DECODE(entry) <<
-			    mapshift) + mapstart + (SM_RUN_DECODE(entry) <<
-			    mapshift)),
+			    mapshift) + sm->sm_start +
+			    (SM_RUN_DECODE(entry) << mapshift)),
 			    (u_longlong_t)(SM_RUN_DECODE(entry) << mapshift));
 			if (SM_TYPE_DECODE(entry) == SM_ALLOC)
 				alloc += SM_RUN_DECODE(entry) << mapshift;
@@ -559,10 +618,10 @@ dump_spacemap(objset_t *os, space_map_ob
 				alloc -= SM_RUN_DECODE(entry) << mapshift;
 		}
 	}
-	if (alloc != smo->smo_alloc) {
+	if (alloc != space_map_allocated(sm)) {
 		(void) printf("space_map_object alloc (%llu) INCONSISTENT "
 		    "with space map summary (%llu)\n",
-		    (u_longlong_t)smo->smo_alloc, (u_longlong_t)alloc);
+		    (u_longlong_t)space_map_allocated(sm), (u_longlong_t)alloc);
 	}
 }
 
@@ -570,15 +629,17 @@ static void
 dump_metaslab_stats(metaslab_t *msp)
 {
 	char maxbuf[32];
-	space_map_t *sm = msp->ms_map;
-	avl_tree_t *t = sm->sm_pp_root;
-	int free_pct = sm->sm_space * 100 / sm->sm_size;
+	range_tree_t *rt = msp->ms_tree;
+	avl_tree_t *t = &msp->ms_size_tree;
+	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
-	zdb_nicenum(space_map_maxsize(sm), maxbuf);
+	zdb_nicenum(metaslab_block_maxsize(msp), maxbuf);
 
 	(void) printf("\t %25s %10lu   %7s  %6s   %4s %4d%%\n",
 	    "segments", avl_numnodes(t), "maxsize", maxbuf,
 	    "freepct", free_pct);
+	(void) printf("\tIn-memory histogram:\n");
+	dump_histogram(rt->rt_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
 }
 
 static void
@@ -586,33 +647,45 @@ dump_metaslab(metaslab_t *msp)
 {
 	vdev_t *vd = msp->ms_group->mg_vd;
 	spa_t *spa = vd->vdev_spa;
-	space_map_t *sm = msp->ms_map;
-	space_map_obj_t *smo = &msp->ms_smo;
+	space_map_t *sm = msp->ms_sm;
 	char freebuf[32];
 
-	zdb_nicenum(sm->sm_size - smo->smo_alloc, freebuf);
+	zdb_nicenum(msp->ms_size - space_map_allocated(sm), freebuf);
 
 	(void) printf(
 	    "\tmetaslab %6llu   offset %12llx   spacemap %6llu   free    %5s\n",
-	    (u_longlong_t)(sm->sm_start / sm->sm_size),
-	    (u_longlong_t)sm->sm_start, (u_longlong_t)smo->smo_object, freebuf);
+	    (u_longlong_t)msp->ms_id, (u_longlong_t)msp->ms_start,
+	    (u_longlong_t)space_map_object(sm), freebuf);
 
-	if (dump_opt['m'] > 1 && !dump_opt['L']) {
+	if (dump_opt['m'] > 2 && !dump_opt['L']) {
 		mutex_enter(&msp->ms_lock);
-		space_map_load_wait(sm);
-		if (!sm->sm_loaded)
-			VERIFY(space_map_load(sm, zfs_metaslab_ops,
-			    SM_FREE, smo, spa->spa_meta_objset) == 0);
+		metaslab_load_wait(msp);
+		if (!msp->ms_loaded) {
+			VERIFY0(metaslab_load(msp));
+			range_tree_stat_verify(msp->ms_tree);
+		}
 		dump_metaslab_stats(msp);
-		space_map_unload(sm);
+		metaslab_unload(msp);
 		mutex_exit(&msp->ms_lock);
 	}
 
-	if (dump_opt['d'] > 5 || dump_opt['m'] > 2) {
-		ASSERT(sm->sm_size == (1ULL << vd->vdev_ms_shift));
+	if (dump_opt['m'] > 1 && sm != NULL &&
+	    spa_feature_is_active(spa,
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) {
+		/*
+		 * The space map histogram represents free space in chunks
+		 * of sm_shift (i.e. bucket 0 refers to 2^sm_shift).
+		 */
+		(void) printf("\tOn-disk histogram:\n");
+		dump_histogram(sm->sm_phys->smp_histogram,
+		    SPACE_MAP_HISTOGRAM_SIZE(sm), sm->sm_shift);
+	}
+
+	if (dump_opt['d'] > 5 || dump_opt['m'] > 3) {
+		ASSERT(msp->ms_size == (1ULL << vd->vdev_ms_shift));
 
 		mutex_enter(&msp->ms_lock);
-		dump_spacemap(spa->spa_meta_objset, smo, sm);
+		dump_spacemap(spa->spa_meta_objset, msp->ms_sm);
 		mutex_exit(&msp->ms_lock);
 	}
 }
@@ -801,9 +874,9 @@ dump_all_ddts(spa_t *spa)
 }
 
 static void
-dump_dtl_seg(space_map_t *sm, uint64_t start, uint64_t size)
+dump_dtl_seg(void *arg, uint64_t start, uint64_t size)
 {
-	char *prefix = (void *)sm;
+	char *prefix = arg;
 
 	(void) printf("%s [%llu,%llu) length %llu\n",
 	    prefix,
@@ -833,17 +906,16 @@ dump_dtl(vdev_t *vd, int indent)
 	    required ? "DTL-required" : "DTL-expendable");
 
 	for (int t = 0; t < DTL_TYPES; t++) {
-		space_map_t *sm = &vd->vdev_dtl[t];
-		if (sm->sm_space == 0)
+		range_tree_t *rt = vd->vdev_dtl[t];
+		if (range_tree_space(rt) == 0)
 			continue;
 		(void) snprintf(prefix, sizeof (prefix), "\t%*s%s",
 		    indent + 2, "", name[t]);
-		mutex_enter(sm->sm_lock);
-		space_map_walk(sm, dump_dtl_seg, (void *)prefix);
-		mutex_exit(sm->sm_lock);
+		mutex_enter(rt->rt_lock);
+		range_tree_walk(rt, dump_dtl_seg, prefix);
+		mutex_exit(rt->rt_lock);
 		if (dump_opt['d'] > 5 && vd->vdev_children == 0)
-			dump_spacemap(spa->spa_meta_objset,
-			    &vd->vdev_dtl_smo, sm);
+			dump_spacemap(spa->spa_meta_objset, vd->vdev_dtl_sm);
 	}
 
 	for (int c = 0; c < vd->vdev_children; c++)
@@ -2172,39 +2244,17 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 }
 
 static void
-zdb_leak(space_map_t *sm, uint64_t start, uint64_t size)
+zdb_leak(void *arg, uint64_t start, uint64_t size)
 {
-	vdev_t *vd = sm->sm_ppd;
+	vdev_t *vd = arg;
 
 	(void) printf("leaked space: vdev %llu, offset 0x%llx, size %llu\n",
 	    (u_longlong_t)vd->vdev_id, (u_longlong_t)start, (u_longlong_t)size);
 }
 
-/* ARGSUSED */
-static void
-zdb_space_map_load(space_map_t *sm)
-{
-}
-
-static void
-zdb_space_map_unload(space_map_t *sm)
-{
-	space_map_vacate(sm, zdb_leak, sm);
-}
-
-/* ARGSUSED */
-static void
-zdb_space_map_claim(space_map_t *sm, uint64_t start, uint64_t size)
-{
-}
-
-static space_map_ops_t zdb_space_map_ops = {
-	zdb_space_map_load,
-	zdb_space_map_unload,
+static metaslab_ops_t zdb_metaslab_ops = {
 	NULL,	/* alloc */

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list