Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Aug 2015 20:14:54 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r287142 - in projects/collation: . bin/ls bin/pkill bin/pkill/tests bin/ps bin/sh bin/sh/tests/builtins bin/sh/tests/errors bin/sh/tests/parser cddl/contrib/opensolaris/cmd/zdb cddl/con...
Message-ID:  <201508252014.t7PKEsAY037339@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Aug 25 20:14:50 2015
New Revision: 287142
URL: https://svnweb.freebsd.org/changeset/base/287142

Log:
  Merge from HEAD

Added:
  projects/collation/bin/sh/tests/builtins/read8.0
     - copied unchanged from r287141, head/bin/sh/tests/builtins/read8.0
  projects/collation/bin/sh/tests/errors/bad-parm-exp7.0
     - copied unchanged from r287141, head/bin/sh/tests/errors/bad-parm-exp7.0
  projects/collation/bin/sh/tests/errors/bad-parm-exp8.0
     - copied unchanged from r287141, head/bin/sh/tests/errors/bad-parm-exp8.0
  projects/collation/bin/sh/tests/parser/dollar-quote12.0
     - copied unchanged from r287141, head/bin/sh/tests/parser/dollar-quote12.0
  projects/collation/bin/sh/tests/parser/dollar-quote13.0
     - copied unchanged from r287141, head/bin/sh/tests/parser/dollar-quote13.0
  projects/collation/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
     - copied unchanged from r287141, head/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/pages.h
     - copied unchanged from r287141, head/contrib/jemalloc/include/jemalloc/internal/pages.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/valgrind.h
     - copied unchanged from r287141, head/contrib/jemalloc/include/jemalloc/internal/valgrind.h
  projects/collation/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h
     - copied unchanged from r287141, head/contrib/jemalloc/include/jemalloc/jemalloc_typedefs.h
  projects/collation/contrib/jemalloc/src/pages.c
     - copied unchanged from r287141, head/contrib/jemalloc/src/pages.c
  projects/collation/contrib/libxo/INSTALL.md
     - copied unchanged from r287141, head/contrib/libxo/INSTALL.md
  projects/collation/contrib/libxo/encoder/
     - copied from r287141, head/contrib/libxo/encoder/
  projects/collation/contrib/libxo/libxo/add.man
     - copied unchanged from r287141, head/contrib/libxo/libxo/add.man
  projects/collation/contrib/libxo/libxo/add.man.in
     - copied unchanged from r287141, head/contrib/libxo/libxo/add.man.in
  projects/collation/contrib/libxo/libxo/xo_buf.h
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_buf.h
  projects/collation/contrib/libxo/libxo/xo_config.h
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_config.h
  projects/collation/contrib/libxo/libxo/xo_emit_err.3
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_emit_err.3
  projects/collation/contrib/libxo/libxo/xo_encoder.c
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_encoder.c
  projects/collation/contrib/libxo/libxo/xo_encoder.h
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_encoder.h
  projects/collation/contrib/libxo/libxo/xo_humanize.h
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_humanize.h
  projects/collation/contrib/libxo/libxo/xo_message.3
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_message.3
  projects/collation/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3
  projects/collation/contrib/libxo/libxo/xo_syslog.3
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_syslog.3
  projects/collation/contrib/libxo/libxo/xo_syslog.c
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_syslog.c
  projects/collation/contrib/libxo/libxo/xo_wcwidth.h
     - copied unchanged from r287141, head/contrib/libxo/libxo/xo_wcwidth.h
  projects/collation/contrib/libxo/tests/core/saved/test_01.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_01.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_01.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_01.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_02.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_02.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_02.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_03.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_03.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_03.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_03.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_04.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_04.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_04.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_04.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_05.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_05.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_05.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_06.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_06.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_06.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_06.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_07.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_07.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_07.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_07.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_08.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_08.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_08.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_09.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_09.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_09.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_09.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_10.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_10.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_10.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_10.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.E.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.E.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.E.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.E.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.H.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.H.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.H.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.H.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.HIPx.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.HIPx.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.HIPx.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.HIPx.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.HP.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.HP.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.HP.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.HP.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.J.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.J.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.J.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.J.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.JP.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.JP.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.JP.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.JP.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.T.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.T.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.T.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.T.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.X.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.X.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.X.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.X.out
  projects/collation/contrib/libxo/tests/core/saved/test_11.XP.err
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.XP.err
  projects/collation/contrib/libxo/tests/core/saved/test_11.XP.out
     - copied unchanged from r287141, head/contrib/libxo/tests/core/saved/test_11.XP.out
  projects/collation/contrib/libxo/tests/core/test_11.c
     - copied unchanged from r287141, head/contrib/libxo/tests/core/test_11.c
  projects/collation/contrib/libxo/tests/gettext/
     - copied from r287141, head/contrib/libxo/tests/gettext/
  projects/collation/contrib/libxo/xopo/
     - copied from r287141, head/contrib/libxo/xopo/
  projects/collation/lib/libc/aarch64/gen/infinity.c
     - copied unchanged from r287141, head/lib/libc/aarch64/gen/infinity.c
  projects/collation/lib/libc/secure/
     - copied from r287141, head/lib/libc/secure/
  projects/collation/lib/libkvm/kvm_minidump_aarch64.c
     - copied unchanged from r287141, head/lib/libkvm/kvm_minidump_aarch64.c
  projects/collation/lib/libnv/tests/nv_array_tests.cc
     - copied unchanged from r287141, head/lib/libnv/tests/nv_array_tests.cc
  projects/collation/share/man/man4/ioat.4
     - copied unchanged from r287141, head/share/man/man4/ioat.4
  projects/collation/share/man/man4/man4.arm/am335x_dmtpps.4
     - copied unchanged from r287141, head/share/man/man4/man4.arm/am335x_dmtpps.4
  projects/collation/share/man/man4/rccgpio.4
     - copied unchanged from r287141, head/share/man/man4/rccgpio.4
  projects/collation/sys/arm/ti/am335x/am335x_dmtpps.c
     - copied unchanged from r287141, head/sys/arm/ti/am335x/am335x_dmtpps.c
  projects/collation/sys/arm/ti/am335x/am335x_dmtreg.h
     - copied unchanged from r287141, head/sys/arm/ti/am335x/am335x_dmtreg.h
  projects/collation/sys/arm64/include/minidump.h
     - copied unchanged from r287141, head/sys/arm64/include/minidump.h
  projects/collation/sys/cam/ctl/ctl_frontend_ioctl.c
     - copied unchanged from r287141, head/sys/cam/ctl/ctl_frontend_ioctl.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
     - copied unchanged from r287141, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c
     - copied unchanged from r287141, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bqueue.h
     - copied unchanged from r287141, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bqueue.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
     - copied unchanged from r287141, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_priority.h
     - copied unchanged from r287141, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_priority.h
  projects/collation/sys/dev/ioat/
     - copied from r287141, head/sys/dev/ioat/
  projects/collation/sys/dev/random/other_algorithm.c
     - copied unchanged from r287141, head/sys/dev/random/other_algorithm.c
  projects/collation/sys/dev/random/other_algorithm.h
     - copied unchanged from r287141, head/sys/dev/random/other_algorithm.h
  projects/collation/sys/dev/random/random_infra.c
     - copied unchanged from r287141, head/sys/dev/random/random_infra.c
  projects/collation/sys/dev/rccgpio/
     - copied from r287141, head/sys/dev/rccgpio/
  projects/collation/sys/modules/am335x_dmtpps/
     - copied from r287141, head/sys/modules/am335x_dmtpps/
  projects/collation/sys/modules/ioat/
     - copied from r287141, head/sys/modules/ioat/
  projects/collation/sys/modules/random_fortuna/
     - copied from r287141, head/sys/modules/random_fortuna/
  projects/collation/sys/modules/random_other/
     - copied from r287141, head/sys/modules/random_other/
  projects/collation/sys/modules/random_yarrow/
     - copied from r287141, head/sys/modules/random_yarrow/
  projects/collation/sys/modules/rccgpio/
     - copied from r287141, head/sys/modules/rccgpio/
  projects/collation/sys/net/altq/altq_codel.c
     - copied unchanged from r287141, head/sys/net/altq/altq_codel.c
  projects/collation/sys/net/altq/altq_codel.h
     - copied unchanged from r287141, head/sys/net/altq/altq_codel.h
  projects/collation/sys/powerpc/mikrotik/
     - copied from r287141, head/sys/powerpc/mikrotik/
  projects/collation/sys/x86/x86/bus_machdep.c
     - copied unchanged from r287141, head/sys/x86/x86/bus_machdep.c
  projects/collation/tools/tools/ioat/
     - copied from r287141, head/tools/tools/ioat/
  projects/collation/usr.sbin/fstyp/tests/
     - copied from r287141, head/usr.sbin/fstyp/tests/
  projects/collation/usr.sbin/ypserv/common/
     - copied from r287141, head/usr.sbin/ypserv/common/
Deleted:
  projects/collation/contrib/libxo/libxo/xoconfig.h
  projects/collation/contrib/libxo/libxo/xoconfig.h.in
  projects/collation/contrib/libxo/libxo/xoversion.h
  projects/collation/contrib/libxo/libxo/xoversion.h.in
  projects/collation/lib/libc/sys/stack_protector.c
  projects/collation/lib/libc/sys/stack_protector_compat.c
  projects/collation/sys/cam/ctl/ctl_frontend_internal.c
  projects/collation/sys/cam/ctl/ctl_frontend_internal.h
  projects/collation/sys/dev/random/randomdev_none.c
  projects/collation/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
  projects/collation/tools/build/options/WITHOUT_SYSINSTALL
Modified:
  projects/collation/Makefile.inc1
  projects/collation/ObsoleteFiles.inc
  projects/collation/UPDATING
  projects/collation/bin/ls/Makefile
  projects/collation/bin/pkill/Makefile
  projects/collation/bin/pkill/Makefile.depend
  projects/collation/bin/pkill/pkill.1
  projects/collation/bin/pkill/pkill.c
  projects/collation/bin/pkill/tests/pgrep-j_test.sh
  projects/collation/bin/pkill/tests/pkill-j_test.sh
  projects/collation/bin/ps/Makefile
  projects/collation/bin/sh/miscbltin.c
  projects/collation/bin/sh/options.c
  projects/collation/bin/sh/parser.c
  projects/collation/bin/sh/tests/builtins/Makefile
  projects/collation/bin/sh/tests/errors/Makefile
  projects/collation/bin/sh/tests/parser/Makefile
  projects/collation/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/collation/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/collation/cddl/contrib/opensolaris/cmd/zhack/zhack.c
  projects/collation/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/collation/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  projects/collation/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/collation/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/collation/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/collation/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/collation/cddl/lib/Makefile
  projects/collation/contrib/apr/CHANGES
  projects/collation/contrib/apr/CMakeLists.txt
  projects/collation/contrib/apr/Makefile.in
  projects/collation/contrib/apr/NOTICE
  projects/collation/contrib/apr/NWGNUmakefile
  projects/collation/contrib/apr/apr.dsp
  projects/collation/contrib/apr/apr.spec
  projects/collation/contrib/apr/build-outputs.mk
  projects/collation/contrib/apr/configure
  projects/collation/contrib/apr/configure.in
  projects/collation/contrib/apr/encoding/apr_escape.c
  projects/collation/contrib/apr/include/apr_skiplist.h
  projects/collation/contrib/apr/include/apr_version.h
  projects/collation/contrib/apr/libapr.dsp
  projects/collation/contrib/apr/locks/unix/proc_mutex.c
  projects/collation/contrib/apr/memory/unix/apr_pools.c
  projects/collation/contrib/apr/misc/unix/errorcodes.c
  projects/collation/contrib/apr/network_io/unix/sockaddr.c
  projects/collation/contrib/apr/network_io/unix/sockets.c
  projects/collation/contrib/apr/poll/unix/epoll.c
  projects/collation/contrib/apr/poll/unix/kqueue.c
  projects/collation/contrib/apr/poll/unix/poll.c
  projects/collation/contrib/apr/poll/unix/pollcb.c
  projects/collation/contrib/apr/poll/unix/port.c
  projects/collation/contrib/apr/poll/unix/z_asio.c
  projects/collation/contrib/apr/tables/apr_skiplist.c
  projects/collation/contrib/binutils/gas/config/tc-i386.c
  projects/collation/contrib/compiler-rt/lib/builtins/floatditf.c
  projects/collation/contrib/compiler-rt/lib/builtins/floatunditf.c
  projects/collation/contrib/compiler-rt/lib/builtins/multc3.c
  projects/collation/contrib/expat/lib/xmlparse.c
  projects/collation/contrib/gcclibs/libcpp/files.c
  projects/collation/contrib/hyperv/tools/hv_kvp_daemon.c
  projects/collation/contrib/jemalloc/COPYING
  projects/collation/contrib/jemalloc/ChangeLog
  projects/collation/contrib/jemalloc/FREEBSD-Xlist
  projects/collation/contrib/jemalloc/FREEBSD-diffs
  projects/collation/contrib/jemalloc/FREEBSD-upgrade
  projects/collation/contrib/jemalloc/VERSION
  projects/collation/contrib/jemalloc/doc/jemalloc.3
  projects/collation/contrib/jemalloc/include/jemalloc/internal/arena.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/atomic.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/base.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/bitmap.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/chunk.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/chunk_dss.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/chunk_mmap.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/ckh.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/ctl.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/extent.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/hash.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/huge.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/mutex.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/prng.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/prof.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/public_namespace.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/ql.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/qr.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/quarantine.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/rb.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/rtree.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/size_classes.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/stats.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/tcache.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/tsd.h
  projects/collation/contrib/jemalloc/include/jemalloc/internal/util.h
  projects/collation/contrib/jemalloc/include/jemalloc/jemalloc.h
  projects/collation/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
  projects/collation/contrib/jemalloc/src/arena.c
  projects/collation/contrib/jemalloc/src/base.c
  projects/collation/contrib/jemalloc/src/bitmap.c
  projects/collation/contrib/jemalloc/src/chunk.c
  projects/collation/contrib/jemalloc/src/chunk_dss.c
  projects/collation/contrib/jemalloc/src/chunk_mmap.c
  projects/collation/contrib/jemalloc/src/ckh.c
  projects/collation/contrib/jemalloc/src/ctl.c
  projects/collation/contrib/jemalloc/src/extent.c
  projects/collation/contrib/jemalloc/src/huge.c
  projects/collation/contrib/jemalloc/src/jemalloc.c
  projects/collation/contrib/jemalloc/src/mutex.c
  projects/collation/contrib/jemalloc/src/prof.c
  projects/collation/contrib/jemalloc/src/quarantine.c
  projects/collation/contrib/jemalloc/src/rtree.c
  projects/collation/contrib/jemalloc/src/stats.c
  projects/collation/contrib/jemalloc/src/tcache.c
  projects/collation/contrib/jemalloc/src/tsd.c
  projects/collation/contrib/jemalloc/src/util.c
  projects/collation/contrib/libxo/.gitignore
  projects/collation/contrib/libxo/.travis.yml
  projects/collation/contrib/libxo/Makefile.am
  projects/collation/contrib/libxo/bin/Zaliases
  projects/collation/contrib/libxo/bin/setup.sh
  projects/collation/contrib/libxo/configure.ac
  projects/collation/contrib/libxo/doc/Makefile.am
  projects/collation/contrib/libxo/doc/libxo.txt
  projects/collation/contrib/libxo/libxo/Makefile.am
  projects/collation/contrib/libxo/libxo/libxo.3
  projects/collation/contrib/libxo/libxo/libxo.c
  projects/collation/contrib/libxo/libxo/xo.h
  projects/collation/contrib/libxo/libxo/xo_attr.3
  projects/collation/contrib/libxo/libxo/xo_create.3
  projects/collation/contrib/libxo/libxo/xo_emit.3
  projects/collation/contrib/libxo/libxo/xo_err.3
  projects/collation/contrib/libxo/libxo/xo_error.3
  projects/collation/contrib/libxo/libxo/xo_finish.3
  projects/collation/contrib/libxo/libxo/xo_flush.3
  projects/collation/contrib/libxo/libxo/xo_format.5
  projects/collation/contrib/libxo/libxo/xo_no_setlocale.3
  projects/collation/contrib/libxo/libxo/xo_open_container.3
  projects/collation/contrib/libxo/libxo/xo_open_list.3
  projects/collation/contrib/libxo/libxo/xo_open_marker.3
  projects/collation/contrib/libxo/libxo/xo_parse_args.3
  projects/collation/contrib/libxo/libxo/xo_set_allocator.3
  projects/collation/contrib/libxo/libxo/xo_set_flags.3
  projects/collation/contrib/libxo/libxo/xo_set_info.3
  projects/collation/contrib/libxo/libxo/xo_set_options.3
  projects/collation/contrib/libxo/libxo/xo_set_style.3
  projects/collation/contrib/libxo/libxo/xo_set_version.3
  projects/collation/contrib/libxo/libxo/xo_set_writer.3
  projects/collation/contrib/libxo/tests/Makefile.am
  projects/collation/contrib/libxo/tests/core/Makefile.am
  projects/collation/contrib/libxo/tests/core/saved/test_01.H.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.HIPx.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.HP.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.J.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.JP.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.T.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.X.out
  projects/collation/contrib/libxo/tests/core/saved/test_01.XP.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.H.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.HIPx.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.HP.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.J.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.JP.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.T.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.X.out
  projects/collation/contrib/libxo/tests/core/saved/test_02.XP.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.H.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.HIPx.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.HP.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.J.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.JP.out   (contents, props changed)
  projects/collation/contrib/libxo/tests/core/saved/test_05.T.out
  projects/collation/contrib/libxo/tests/core/saved/test_05.X.out   (contents, props changed)
  projects/collation/contrib/libxo/tests/core/saved/test_05.XP.out   (contents, props changed)
  projects/collation/contrib/libxo/tests/core/saved/test_08.H.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.HIPx.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.HIPx.out
  projects/collation/contrib/libxo/tests/core/saved/test_08.HP.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.J.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.J.out
  projects/collation/contrib/libxo/tests/core/saved/test_08.JP.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.JP.out
  projects/collation/contrib/libxo/tests/core/saved/test_08.T.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.X.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.X.out
  projects/collation/contrib/libxo/tests/core/saved/test_08.XP.err
  projects/collation/contrib/libxo/tests/core/saved/test_08.XP.out
  projects/collation/contrib/libxo/tests/core/test_01.c
  projects/collation/contrib/libxo/tests/core/test_02.c
  projects/collation/contrib/libxo/tests/core/test_05.c
  projects/collation/contrib/libxo/tests/core/test_08.c
  projects/collation/contrib/libxo/xo/Makefile.am
  projects/collation/contrib/libxo/xo/xo.1
  projects/collation/contrib/libxo/xo/xo.c
  projects/collation/contrib/libxo/xohtml/Makefile.am
  projects/collation/contrib/libxo/xohtml/xohtml.1
  projects/collation/contrib/libxo/xolint/Makefile.am
  projects/collation/contrib/libxo/xolint/xolint.1
  projects/collation/contrib/libxo/xolint/xolint.pl
  projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
  projects/collation/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
  projects/collation/contrib/serf/CHANGES
  projects/collation/contrib/serf/auth/auth_spnego_sspi.c
  projects/collation/contrib/serf/buckets/deflate_buckets.c
  projects/collation/contrib/serf/buckets/ssl_buckets.c
  projects/collation/contrib/serf/serf.h
  projects/collation/contrib/sqlite3/Makefile.am
  projects/collation/contrib/sqlite3/Makefile.in
  projects/collation/contrib/sqlite3/configure
  projects/collation/contrib/sqlite3/configure.ac
  projects/collation/contrib/sqlite3/shell.c
  projects/collation/contrib/sqlite3/sqlite3.c
  projects/collation/contrib/sqlite3/sqlite3.h
  projects/collation/contrib/sqlite3/sqlite3ext.h
  projects/collation/contrib/subversion/CHANGES
  projects/collation/contrib/subversion/Makefile.in
  projects/collation/contrib/subversion/NOTICE
  projects/collation/contrib/subversion/autogen.sh
  projects/collation/contrib/subversion/build-outputs.mk
  projects/collation/contrib/subversion/build.conf
  projects/collation/contrib/subversion/configure
  projects/collation/contrib/subversion/configure.ac
  projects/collation/contrib/subversion/get-deps.sh
  projects/collation/contrib/subversion/subversion/include/private/svn_diff_private.h
  projects/collation/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
  projects/collation/contrib/subversion/subversion/include/private/svn_repos_private.h
  projects/collation/contrib/subversion/subversion/include/private/svn_sqlite.h
  projects/collation/contrib/subversion/subversion/include/svn_io.h
  projects/collation/contrib/subversion/subversion/include/svn_version.h
  projects/collation/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  projects/collation/contrib/subversion/subversion/libsvn_client/copy.c
  projects/collation/contrib/subversion/subversion/libsvn_client/externals.c
  projects/collation/contrib/subversion/subversion/libsvn_client/log.c
  projects/collation/contrib/subversion/subversion/libsvn_client/merge.c
  projects/collation/contrib/subversion/subversion/libsvn_client/patch.c
  projects/collation/contrib/subversion/subversion/libsvn_client/upgrade.c
  projects/collation/contrib/subversion/subversion/libsvn_delta/svndiff.c
  projects/collation/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  projects/collation/contrib/subversion/subversion/libsvn_diff/util.c
  projects/collation/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  projects/collation/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  projects/collation/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  projects/collation/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  projects/collation/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  projects/collation/contrib/subversion/subversion/libsvn_ra_serf/options.c
  projects/collation/contrib/subversion/subversion/libsvn_repos/commit.c
  projects/collation/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  projects/collation/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/config.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/dso.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/error.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  projects/collation/contrib/subversion/subversion/libsvn_subr/io.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/string.c
  projects/collation/contrib/subversion/subversion/libsvn_subr/version.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/adm_ops.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/cleanup.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/conflicts.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/copy.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/diff.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/diff_local.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/entries.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/externals.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/update_editor.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc_db.c
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc_db.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  projects/collation/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  projects/collation/contrib/subversion/subversion/svn/conflict-callbacks.c
  projects/collation/contrib/subversion/subversion/svn/list-cmd.c
  projects/collation/contrib/subversion/subversion/svn/svn.c
  projects/collation/contrib/subversion/subversion/svn/util.c
  projects/collation/contrib/subversion/subversion/svn_private_config.h.in
  projects/collation/contrib/subversion/subversion/svnadmin/svnadmin.c
  projects/collation/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  projects/collation/contrib/subversion/subversion/svnrdump/load_editor.c
  projects/collation/contrib/subversion/subversion/svnserve/serve.c
  projects/collation/contrib/subversion/subversion/svnsync/sync.c
  projects/collation/contrib/subversion/win-tests.py
  projects/collation/contrib/tzdata/africa
  projects/collation/contrib/tzdata/asia
  projects/collation/contrib/tzdata/europe
  projects/collation/contrib/tzdata/leap-seconds.list
  projects/collation/contrib/tzdata/leapseconds
  projects/collation/contrib/tzdata/northamerica
  projects/collation/contrib/tzdata/southamerica
  projects/collation/contrib/tzdata/zone.tab
  projects/collation/contrib/tzdata/zone1970.tab
  projects/collation/etc/group
  projects/collation/etc/mtree/BSD.tests.dist
  projects/collation/etc/mtree/BSD.usr.dist
  projects/collation/etc/network.subr
  projects/collation/etc/portsnap.conf
  projects/collation/etc/rc.d/hostname
  projects/collation/etc/rc.d/netif
  projects/collation/gnu/usr.bin/binutils/Makefile
  projects/collation/include/malloc_np.h
  projects/collation/lib/Makefile
  projects/collation/lib/libc/Makefile
  projects/collation/lib/libc/aarch64/Symbol.map
  projects/collation/lib/libc/aarch64/gen/Makefile.inc
  projects/collation/lib/libc/gen/tls.c
  projects/collation/lib/libc/gen/wordexp.3
  projects/collation/lib/libc/gen/wordexp.c
  projects/collation/lib/libc/locale/utf8.c
  projects/collation/lib/libc/net/rcmdsh.c
  projects/collation/lib/libc/posix1e/acl_flag.c
  projects/collation/lib/libc/stdlib/jemalloc/Makefile.inc
  projects/collation/lib/libc/stdlib/jemalloc/Symbol.map
  projects/collation/lib/libc/string/bcopy.3
  projects/collation/lib/libc/string/bzero.3
  projects/collation/lib/libc/sys/Makefile.inc
  projects/collation/lib/libc/sys/Symbol.map
  projects/collation/lib/libc/sys/getrlimit.2
  projects/collation/lib/libc/sys/procctl.2
  projects/collation/lib/libc/tests/sys/Makefile
  projects/collation/lib/libgeom/geom_xml2tree.c
  projects/collation/lib/libkvm/kvm_aarch64.c
  projects/collation/lib/libkvm/kvm_private.h
  projects/collation/lib/libnv/tests/Makefile
  projects/collation/lib/libproc/proc_bkpt.c
  projects/collation/lib/libproc/tests/proc_test.c
  projects/collation/lib/libsqlite3/Makefile
  projects/collation/lib/libthr/thread/thr_rtld.c
  projects/collation/lib/libthr/thread/thr_sig.c
  projects/collation/lib/libusb/Makefile
  projects/collation/lib/libutil/tests/Makefile
  projects/collation/lib/libxo/Makefile
  projects/collation/lib/msun/src/s_exp2.c
  projects/collation/libexec/ftpd/Makefile
  projects/collation/release/doc/en_US.ISO8859-1/errata/article.xml
  projects/collation/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/collation/sbin/camcontrol/camcontrol.8
  projects/collation/sbin/camcontrol/camcontrol.c
  projects/collation/sbin/camcontrol/camcontrol.h
  projects/collation/sbin/camcontrol/fwdownload.c
  projects/collation/sbin/camcontrol/progress.c
  projects/collation/sbin/ifconfig/ifconfig.8
  projects/collation/sbin/ifconfig/iflagg.c
  projects/collation/sbin/ipfw/ipfw2.c
  projects/collation/sbin/ipfw/nat.c
  projects/collation/sbin/ipfw/tables.c
  projects/collation/sbin/newfs/newfs.c
  projects/collation/sbin/pfctl/parse.y
  projects/collation/sbin/pfctl/pfctl_altq.c
  projects/collation/sbin/pfctl/pfctl_parser.h
  projects/collation/sbin/pfctl/pfctl_qstats.c
  projects/collation/sbin/ping6/Makefile
  projects/collation/sbin/ping6/ping6.c
  projects/collation/sbin/reboot/nextboot.8
  projects/collation/sbin/savecore/Makefile
  projects/collation/share/man/man4/Makefile
  projects/collation/share/man/man4/altq.4
  projects/collation/share/man/man4/cloudabi.4
  projects/collation/share/man/man4/ctl.4
  projects/collation/share/man/man4/em.4
  projects/collation/share/man/man4/gre.4
  projects/collation/share/man/man4/hptiop.4
  projects/collation/share/man/man4/man4.i386/wl.4
  projects/collation/share/man/man4/ng_btsocket.4
  projects/collation/share/man/man4/random.4
  projects/collation/share/man/man4/siftr.4
  projects/collation/share/man/man4/snp.4
  projects/collation/share/man/man4/timecounters.4
  projects/collation/share/man/man4/uart.4
  projects/collation/share/man/man4/uftdi.4
  projects/collation/share/man/man4/vt.4
  projects/collation/share/man/man4/wlan.4
  projects/collation/share/man/man5/rc.conf.5
  projects/collation/share/man/man5/src.conf.5
  projects/collation/share/man/man7/release.7
  projects/collation/share/man/man8/nanobsd.8
  projects/collation/share/man/man8/uefi.8
  projects/collation/share/man/man8/yp.8
  projects/collation/share/man/man9/Makefile
  projects/collation/share/man/man9/PCI_IOV_ADD_VF.9
  projects/collation/share/man/man9/PCI_IOV_INIT.9
  projects/collation/share/man/man9/altq.9
  projects/collation/share/man/man9/atomic.9
  projects/collation/share/man/man9/devfs_set_cdevpriv.9
  projects/collation/share/man/man9/ifnet.9
  projects/collation/share/man/man9/nv.9
  projects/collation/share/misc/committers-src.dot
  projects/collation/share/misc/pci_vendors
  projects/collation/share/mk/bsd.README
  projects/collation/share/mk/bsd.cpu.mk
  projects/collation/share/mk/bsd.lib.mk
  projects/collation/share/mk/bsd.own.mk
  projects/collation/share/mk/src.opts.mk
  projects/collation/share/mk/sys.mk
  projects/collation/share/zoneinfo/Makefile
  projects/collation/sys/amd64/amd64/genassym.c
  projects/collation/sys/amd64/amd64/machdep.c
  projects/collation/sys/amd64/amd64/mp_machdep.c
  projects/collation/sys/amd64/amd64/pmap.c
  projects/collation/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/collation/sys/amd64/conf/NOTES
  projects/collation/sys/arm/arm/busdma_machdep-v6.c
  projects/collation/sys/arm/arm/cpufunc.c
  projects/collation/sys/arm/arm/identcpu.c
  projects/collation/sys/arm/arm/locore-v6.S
  projects/collation/sys/arm/arm/machdep.c
  projects/collation/sys/arm/arm/pmap-v6-new.c
  projects/collation/sys/arm/arm/stdatomic.c
  projects/collation/sys/arm/at91/at91_machdep.c
  projects/collation/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
  projects/collation/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/collation/sys/arm/conf/BEAGLEBONE
  projects/collation/sys/arm/conf/IMX6
  projects/collation/sys/arm/conf/std.armv6
  projects/collation/sys/arm/freescale/imx/imx_wdog.c
  projects/collation/sys/arm/freescale/imx/imx_wdogreg.h
  projects/collation/sys/arm/include/armreg.h
  projects/collation/sys/arm/include/param.h
  projects/collation/sys/arm/include/proc.h
  projects/collation/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  projects/collation/sys/arm/ti/am335x/am335x_dmtimer.c
  projects/collation/sys/arm/ti/am335x/am335x_prcm.c
  projects/collation/sys/arm/ti/am335x/files.am335x
  projects/collation/sys/arm/ti/ti_hwmods.c
  projects/collation/sys/arm/ti/ti_hwmods.h
  projects/collation/sys/arm/ti/ti_scm.c
  projects/collation/sys/arm/versatile/sp804.c
  projects/collation/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/collation/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/collation/sys/arm/xscale/i8134x/crb_machdep.c
  projects/collation/sys/arm/xscale/ixp425/avila_machdep.c
  projects/collation/sys/arm/xscale/pxa/pxa_machdep.c
  projects/collation/sys/arm64/arm64/bus_machdep.c
  projects/collation/sys/arm64/arm64/bus_space_asm.S
  projects/collation/sys/arm64/arm64/db_interface.c
  projects/collation/sys/arm64/arm64/exception.S
  projects/collation/sys/arm64/arm64/gic_v3.c
  projects/collation/sys/arm64/arm64/gic_v3_its.c
  projects/collation/sys/arm64/arm64/gic_v3_reg.h
  projects/collation/sys/arm64/arm64/gic_v3_var.h
  projects/collation/sys/arm64/arm64/locore.S
  projects/collation/sys/arm64/arm64/minidump_machdep.c
  projects/collation/sys/arm64/arm64/mp_machdep.c
  projects/collation/sys/arm64/arm64/pmap.c
  projects/collation/sys/arm64/arm64/support.S
  projects/collation/sys/arm64/arm64/trap.c
  projects/collation/sys/arm64/arm64/uma_machdep.c
  projects/collation/sys/arm64/arm64/unwind.c
  projects/collation/sys/arm64/include/armreg.h
  projects/collation/sys/arm64/include/cpu.h
  projects/collation/sys/arm64/include/md_var.h
  projects/collation/sys/arm64/include/param.h
  projects/collation/sys/arm64/include/pmap.h
  projects/collation/sys/boot/efi/Makefile.inc
  projects/collation/sys/boot/kshim/bsd_kernel.h
  projects/collation/sys/boot/uboot/fdt/uboot_fdt.c
  projects/collation/sys/cam/ata/ata_da.c
  projects/collation/sys/cam/ctl/README.ctl.txt
  projects/collation/sys/cam/ctl/ctl.c
  projects/collation/sys/cam/ctl/ctl.h
  projects/collation/sys/cam/ctl/ctl_backend.c
  projects/collation/sys/cam/ctl/ctl_backend_block.c
  projects/collation/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/collation/sys/cam/ctl/ctl_cmd_table.c
  projects/collation/sys/cam/ctl/ctl_error.c
  projects/collation/sys/cam/ctl/ctl_frontend.c
  projects/collation/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/collation/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/collation/sys/cam/ctl/ctl_ioctl.h
  projects/collation/sys/cam/ctl/ctl_private.h
  projects/collation/sys/cam/ctl/ctl_tpc.c
  projects/collation/sys/cam/ctl/ctl_tpc_local.c
  projects/collation/sys/cam/scsi/scsi_all.c
  projects/collation/sys/cam/scsi/scsi_all.h
  projects/collation/sys/cddl/compat/opensolaris/sys/kstat.h
  projects/collation/sys/cddl/compat/opensolaris/sys/nvpair.h
  projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/collation/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c
  projects/collation/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/collation/sys/compat/cloudabi/cloudabi_fd.c
  projects/collation/sys/compat/cloudabi/cloudabi_file.c
  projects/collation/sys/compat/cloudabi/cloudabi_proc.c
  projects/collation/sys/compat/cloudabi/cloudabi_sock.c
  projects/collation/sys/compat/cloudabi64/cloudabi64_poll.c
  projects/collation/sys/compat/cloudabi64/cloudabi64_sock.c
  projects/collation/sys/conf/Makefile.arm
  projects/collation/sys/conf/NOTES
  projects/collation/sys/conf/files
  projects/collation/sys/conf/files.amd64
  projects/collation/sys/conf/files.i386
  projects/collation/sys/conf/files.powerpc
  projects/collation/sys/conf/kern.post.mk
  projects/collation/sys/conf/kern.pre.mk
  projects/collation/sys/conf/options
  projects/collation/sys/conf/options.powerpc
  projects/collation/sys/contrib/libnv/nv_impl.h
  projects/collation/sys/contrib/libnv/nvlist.c
  projects/collation/sys/contrib/libnv/nvlist_impl.h
  projects/collation/sys/contrib/libnv/nvpair.c
  projects/collation/sys/contrib/libnv/nvpair_impl.h
  projects/collation/sys/ddb/db_ps.c
  projects/collation/sys/dev/ata/ata-all.c
  projects/collation/sys/dev/ata/ata-all.h
  projects/collation/sys/dev/ath/if_ath.c
  projects/collation/sys/dev/ath/if_ath_keycache.c
  projects/collation/sys/dev/ath/if_ath_rx.c
  projects/collation/sys/dev/ath/if_ath_tdma.c
  projects/collation/sys/dev/ath/if_ath_tx.c
  projects/collation/sys/dev/bwi/if_bwi.c
  projects/collation/sys/dev/bwn/if_bwn.c
  projects/collation/sys/dev/bxe/ecore_hsi.h
  projects/collation/sys/dev/cxgbe/adapter.h
  projects/collation/sys/dev/cxgbe/t4_main.c
  projects/collation/sys/dev/cyapa/cyapa.c
  projects/collation/sys/dev/drm/drmP.h
  projects/collation/sys/dev/drm2/drmP.h
  projects/collation/sys/dev/e1000/e1000_80003es2lan.c
  projects/collation/sys/dev/e1000/e1000_80003es2lan.h
  projects/collation/sys/dev/e1000/e1000_82540.c
  projects/collation/sys/dev/e1000/e1000_82541.c
  projects/collation/sys/dev/e1000/e1000_82541.h
  projects/collation/sys/dev/e1000/e1000_82542.c
  projects/collation/sys/dev/e1000/e1000_82543.c
  projects/collation/sys/dev/e1000/e1000_82543.h
  projects/collation/sys/dev/e1000/e1000_82571.c
  projects/collation/sys/dev/e1000/e1000_82571.h
  projects/collation/sys/dev/e1000/e1000_82575.c
  projects/collation/sys/dev/e1000/e1000_82575.h
  projects/collation/sys/dev/e1000/e1000_api.c
  projects/collation/sys/dev/e1000/e1000_api.h
  projects/collation/sys/dev/e1000/e1000_defines.h
  projects/collation/sys/dev/e1000/e1000_hw.h
  projects/collation/sys/dev/e1000/e1000_i210.c
  projects/collation/sys/dev/e1000/e1000_i210.h
  projects/collation/sys/dev/e1000/e1000_ich8lan.c
  projects/collation/sys/dev/e1000/e1000_ich8lan.h
  projects/collation/sys/dev/e1000/e1000_mac.c
  projects/collation/sys/dev/e1000/e1000_mac.h
  projects/collation/sys/dev/e1000/e1000_manage.c
  projects/collation/sys/dev/e1000/e1000_manage.h
  projects/collation/sys/dev/e1000/e1000_mbx.c
  projects/collation/sys/dev/e1000/e1000_mbx.h
  projects/collation/sys/dev/e1000/e1000_nvm.c
  projects/collation/sys/dev/e1000/e1000_nvm.h
  projects/collation/sys/dev/e1000/e1000_osdep.c
  projects/collation/sys/dev/e1000/e1000_osdep.h
  projects/collation/sys/dev/e1000/e1000_phy.c
  projects/collation/sys/dev/e1000/e1000_phy.h
  projects/collation/sys/dev/e1000/e1000_regs.h
  projects/collation/sys/dev/e1000/e1000_vf.c
  projects/collation/sys/dev/e1000/e1000_vf.h
  projects/collation/sys/dev/e1000/if_em.c
  projects/collation/sys/dev/e1000/if_em.h
  projects/collation/sys/dev/e1000/if_igb.c
  projects/collation/sys/dev/e1000/if_igb.h
  projects/collation/sys/dev/e1000/if_lem.c
  projects/collation/sys/dev/e1000/if_lem.h
  projects/collation/sys/dev/fdt/fdt_slicer.c
  projects/collation/sys/dev/gpio/gpiobus.c
  projects/collation/sys/dev/gpio/gpioled.c
  projects/collation/sys/dev/hwpmc/hwpmc_mod.c
  projects/collation/sys/dev/ichiic/ig4_iic.c
  projects/collation/sys/dev/ichwd/ichwd.c
  projects/collation/sys/dev/ichwd/ichwd.h
  projects/collation/sys/dev/ipw/if_ipw.c
  projects/collation/sys/dev/isl/isl.c
  projects/collation/sys/dev/iwm/if_iwm.c
  projects/collation/sys/dev/iwn/if_iwn.c
  projects/collation/sys/dev/md/md.c
  projects/collation/sys/dev/mps/mps.c
  projects/collation/sys/dev/mps/mps_config.c
  projects/collation/sys/dev/mps/mpsvar.h
  projects/collation/sys/dev/pccbb/pccbb.c
  projects/collation/sys/dev/psci/psci.c
  projects/collation/sys/dev/random/build.sh
  projects/collation/sys/dev/random/fortuna.c
  projects/collation/sys/dev/random/random_harvestq.c
  projects/collation/sys/dev/random/random_harvestq.h
  projects/collation/sys/dev/random/randomdev.c
  projects/collation/sys/dev/random/randomdev.h
  projects/collation/sys/dev/random/unit_test.c
  projects/collation/sys/dev/random/yarrow.c
  projects/collation/sys/dev/sound/midi/midi.c
  projects/collation/sys/dev/uart/uart_bus.h
  projects/collation/sys/dev/uart/uart_bus_pci.c
  projects/collation/sys/dev/uart/uart_core.c
  projects/collation/sys/dev/usb/controller/dwc_otg.c
  projects/collation/sys/dev/usb/controller/dwc_otg.h
  projects/collation/sys/dev/usb/controller/usb_controller.c
  projects/collation/sys/dev/usb/usb_bus.h
  projects/collation/sys/dev/usb/usb_device.c
  projects/collation/sys/dev/usb/usb_hub.c
  projects/collation/sys/dev/usb/usb_pf.c
  projects/collation/sys/dev/usb/usb_process.h
  projects/collation/sys/dev/usb/usb_transfer.c
  projects/collation/sys/dev/usb/usbdi.h
  projects/collation/sys/dev/usb/wlan/if_rsu.c
  projects/collation/sys/dev/usb/wlan/if_rum.c
  projects/collation/sys/dev/usb/wlan/if_run.c
  projects/collation/sys/dev/usb/wlan/if_uath.c
  projects/collation/sys/dev/usb/wlan/if_upgt.c
  projects/collation/sys/dev/usb/wlan/if_ural.c
  projects/collation/sys/dev/usb/wlan/if_urtw.c
  projects/collation/sys/dev/usb/wlan/if_urtwn.c
  projects/collation/sys/dev/usb/wlan/if_zyd.c
  projects/collation/sys/dev/vt/hw/efifb/efifb.c
  projects/collation/sys/dev/vt/hw/fb/vt_fb.c
  projects/collation/sys/dev/vt/hw/vga/vt_vga.c
  projects/collation/sys/dev/vt/hw/vga/vt_vga_reg.h
  projects/collation/sys/dev/vt/vt.h
  projects/collation/sys/dev/vt/vt_core.c
  projects/collation/sys/dev/vt/vt_cpulogos.c
  projects/collation/sys/dev/wi/if_wi.c
  projects/collation/sys/dev/wpi/if_wpi.c
  projects/collation/sys/dev/xen/blkback/blkback.c
  projects/collation/sys/dev/xen/blkfront/blkfront.c
  projects/collation/sys/dev/xen/netfront/netfront.c
  projects/collation/sys/dev/xen/xenstore/xenstore.c
  projects/collation/sys/fs/devfs/devfs_vfsops.c
  projects/collation/sys/fs/devfs/devfs_vnops.c
  projects/collation/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/collation/sys/geom/geom_flashmap.c
  projects/collation/sys/geom/raid/md_intel.c
  projects/collation/sys/geom/raid/md_jmicron.c
  projects/collation/sys/geom/raid/md_nvidia.c
  projects/collation/sys/geom/raid/md_sii.c
  projects/collation/sys/geom/uncompress/g_uncompress.c
  projects/collation/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  projects/collation/sys/i386/i386/genassym.c
  projects/collation/sys/i386/i386/machdep.c
  projects/collation/sys/i386/i386/mp_machdep.c
  projects/collation/sys/i386/i386/pmap.c
  projects/collation/sys/i386/i386/sys_machdep.c
  projects/collation/sys/kern/genassym.sh
  projects/collation/sys/kern/kern_descrip.c
  projects/collation/sys/kern/kern_event.c
  projects/collation/sys/kern/kern_exit.c
  projects/collation/sys/kern/kern_fork.c
  projects/collation/sys/kern/kern_procctl.c
  projects/collation/sys/kern/kern_sig.c
  projects/collation/sys/kern/kern_tc.c
  projects/collation/sys/kern/kern_timeout.c
  projects/collation/sys/kern/link_elf.c
  projects/collation/sys/kern/subr_module.c
  projects/collation/sys/kern/subr_param.c
  projects/collation/sys/kern/sys_capability.c
  projects/collation/sys/kern/vfs_lookup.c
  projects/collation/sys/kern/vfs_mount.c
  projects/collation/sys/kern/vfs_mountroot.c
  projects/collation/sys/kern/vfs_subr.c
  projects/collation/sys/mips/beri/beri_machdep.c
  projects/collation/sys/mips/mips/fp.S
  projects/collation/sys/modules/Makefile
  projects/collation/sys/modules/ctl/Makefile
  projects/collation/sys/modules/gpio/gpiobus/Makefile
  projects/collation/sys/modules/zfs/Makefile
  projects/collation/sys/net/altq/altq.h
  projects/collation/sys/net/altq/altq_cbq.c
  projects/collation/sys/net/altq/altq_cbq.h
  projects/collation/sys/net/altq/altq_classq.h
  projects/collation/sys/net/altq/altq_fairq.c
  projects/collation/sys/net/altq/altq_fairq.h
  projects/collation/sys/net/altq/altq_hfsc.c
  projects/collation/sys/net/altq/altq_hfsc.h
  projects/collation/sys/net/altq/altq_priq.c
  projects/collation/sys/net/altq/altq_priq.h
  projects/collation/sys/net/altq/altq_rmclass.c
  projects/collation/sys/net/altq/altq_rmclass.h
  projects/collation/sys/net/altq/altq_subr.c
  projects/collation/sys/net/altq/altq_var.h
  projects/collation/sys/net/ieee8023ad_lacp.c
  projects/collation/sys/net/ieee8023ad_lacp.h
  projects/collation/sys/net/if_lagg.c
  projects/collation/sys/net/if_lagg.h
  projects/collation/sys/net/if_llatbl.c
  projects/collation/sys/net/if_llatbl.h
  projects/collation/sys/net/route.c
  projects/collation/sys/net/route.h
  projects/collation/sys/net80211/ieee80211_proto.c
  projects/collation/sys/netinet/if_ether.c
  projects/collation/sys/netinet/in.c
  projects/collation/sys/netinet/in_rmx.c
  projects/collation/sys/netinet/sctp_timer.c
  projects/collation/sys/netinet/tcp_reass.c
  projects/collation/sys/netinet/tcp_timer.c
  projects/collation/sys/netinet/tcp_timer.h
  projects/collation/sys/netinet/toecore.c
  projects/collation/sys/netinet6/in6.c
  projects/collation/sys/netinet6/in6_ifattach.c
  projects/collation/sys/netinet6/in6_rmx.c
  projects/collation/sys/netinet6/in6_rss.c
  projects/collation/sys/netinet6/in6_rss.h
  projects/collation/sys/netinet6/in6_var.h
  projects/collation/sys/netinet6/nd6.c
  projects/collation/sys/netinet6/nd6.h
  projects/collation/sys/netinet6/nd6_nbr.c
  projects/collation/sys/netinet6/nd6_rtr.c
  projects/collation/sys/netinet6/udp6_usrreq.c
  projects/collation/sys/netpfil/pf/pf_altq.h
  projects/collation/sys/netpfil/pf/pf_if.c
  projects/collation/sys/netpfil/pf/pf_ioctl.c
  projects/collation/sys/ofed/drivers/infiniband/core/cma.c
  projects/collation/sys/powerpc/aim/mmu_oea.c
  projects/collation/sys/powerpc/aim/mmu_oea64.c
  projects/collation/sys/powerpc/booke/locore.S
  projects/collation/sys/powerpc/booke/pmap.c
  projects/collation/sys/powerpc/booke/trap_subr.S
  projects/collation/sys/powerpc/include/_types.h
  projects/collation/sys/powerpc/include/param.h
  projects/collation/sys/powerpc/include/pte.h
  projects/collation/sys/powerpc/include/tlb.h
  projects/collation/sys/powerpc/mpc85xx/mpc85xx.h
  projects/collation/sys/powerpc/mpc85xx/pci_mpc85xx.c
  projects/collation/sys/powerpc/mpc85xx/pci_mpc85xx_pcib.c
  projects/collation/sys/powerpc/mpc85xx/platform_mpc85xx.c
  projects/collation/sys/powerpc/ofw/ofw_machdep.c
  projects/collation/sys/powerpc/powerpc/trap.c
  projects/collation/sys/powerpc/powerpc/uma_machdep.c
  projects/collation/sys/rpc/rpc_generic.c
  projects/collation/sys/rpc/svc_vc.c
  projects/collation/sys/sys/ata.h
  projects/collation/sys/sys/cdefs.h
  projects/collation/sys/sys/conf.h
  projects/collation/sys/sys/nv.h
  projects/collation/sys/sys/param.h
  projects/collation/sys/sys/random.h
  projects/collation/sys/sys/slicer.h
  projects/collation/sys/sys/socketvar.h
  projects/collation/sys/sys/syscallsubr.h
  projects/collation/sys/sys/timeet.h
  projects/collation/sys/sys/timetc.h
  projects/collation/sys/sys/vnode.h
  projects/collation/sys/teken/demo/teken_demo.c
  projects/collation/sys/teken/teken.c
  projects/collation/sys/teken/teken_subr.h
  projects/collation/sys/vm/swap_pager.c
  projects/collation/sys/vm/uma_core.c
  projects/collation/sys/vm/vm_glue.c
  projects/collation/sys/vm/vm_page.c
  projects/collation/sys/vm/vm_pageout.c
  projects/collation/sys/x86/acpica/madt.c
  projects/collation/sys/x86/include/bus.h
  projects/collation/sys/x86/iommu/intel_idpgtbl.c
  projects/collation/sys/x86/x86/busdma_bounce.c
  projects/collation/sys/x86/x86/fdt_machdep.c
  projects/collation/sys/x86/x86/local_apic.c
  projects/collation/sys/x86/x86/nexus.c
  projects/collation/sys/x86/xen/hvm.c
  projects/collation/sys/x86/xen/pv.c
  projects/collation/sys/xen/gnttab.h
  projects/collation/sys/xen/xen-os.h
  projects/collation/targets/pseudo/toolchain/Makefile.depend
  projects/collation/tools/build/mk/OptionalObsoleteFiles.inc
  projects/collation/tools/regression/lib/libc/gen/test-wordexp.c
  projects/collation/tools/tools/iwn/iwnstats/main.c
  projects/collation/tools/tools/nanobsd/defaults.sh
  projects/collation/tools/tools/nanobsd/gateworks/common
  projects/collation/tools/tools/nanobsd/pcengines/common.conf
  projects/collation/tools/tools/nanobsd/rescue/common
  projects/collation/tools/tools/sysbuild/sysbuild.sh
  projects/collation/usr.bin/Makefile
  projects/collation/usr.bin/at/Makefile.inc
  projects/collation/usr.bin/calendar/calendars/calendar.christian
  projects/collation/usr.bin/calendar/calendars/calendar.freebsd
  projects/collation/usr.bin/ctlstat/ctlstat.c
  projects/collation/usr.bin/iscsictl/Makefile
  projects/collation/usr.bin/localedef/collate.c
  projects/collation/usr.bin/lorder/lorder.1
  projects/collation/usr.bin/lorder/lorder.sh
  projects/collation/usr.bin/mkimg/mkimg.1
  projects/collation/usr.bin/netstat/Makefile
  projects/collation/usr.bin/patch/common.h
  projects/collation/usr.bin/patch/inp.c
  projects/collation/usr.bin/patch/patch.1
  projects/collation/usr.bin/patch/pch.c
  projects/collation/usr.bin/patch/util.c
  projects/collation/usr.bin/patch/util.h
  projects/collation/usr.bin/svn/lib/libapr/apr.h
  projects/collation/usr.bin/svn/lib/libapr/apr_private.h
  projects/collation/usr.bin/svn/lib/libapr_util/apu.h
  projects/collation/usr.bin/svn/lib/libapr_util/apu_config.h
  projects/collation/usr.bin/svn/svn_private_config.h
  projects/collation/usr.bin/svn/svnversion/Makefile
  projects/collation/usr.bin/truss/amd64-fbsd.c
  projects/collation/usr.bin/truss/amd64-fbsd32.c
  projects/collation/usr.bin/truss/amd64-linux32.c
  projects/collation/usr.bin/truss/arm-fbsd.c
  projects/collation/usr.bin/truss/i386-fbsd.c
  projects/collation/usr.bin/truss/i386-linux.c
  projects/collation/usr.bin/truss/main.c
  projects/collation/usr.bin/truss/mips-fbsd.c
  projects/collation/usr.bin/truss/powerpc-fbsd.c
  projects/collation/usr.bin/truss/powerpc64-fbsd.c
  projects/collation/usr.bin/truss/sparc64-fbsd.c
  projects/collation/usr.bin/truss/syscall.h
  projects/collation/usr.bin/truss/syscalls.c
  projects/collation/usr.bin/w/Makefile
  projects/collation/usr.bin/wc/Makefile
  projects/collation/usr.bin/wc/wc.1
  projects/collation/usr.bin/whois/whois.c
  projects/collation/usr.bin/xargs/tests/regress.n2P0.out
  projects/collation/usr.bin/xargs/tests/regress.sh
  projects/collation/usr.bin/xlint/lint1/decl.c
  projects/collation/usr.bin/xlint/lint1/func.c
  projects/collation/usr.bin/xlint/lint1/init.c
  projects/collation/usr.bin/xlint/lint1/lint.h
  projects/collation/usr.bin/xlint/lint1/lint1.h
  projects/collation/usr.bin/xlint/lint1/scan.l
  projects/collation/usr.bin/xlint/lint1/tree.c
  projects/collation/usr.bin/xlint/lint2/read.c
  projects/collation/usr.bin/xo/Makefile
  projects/collation/usr.bin/ypcat/ypcat.c
  projects/collation/usr.bin/ypmatch/ypmatch.c
  projects/collation/usr.bin/ypwhich/Makefile
  projects/collation/usr.bin/ypwhich/ypwhich.c
  projects/collation/usr.sbin/bhyve/bhyve.8
  projects/collation/usr.sbin/bhyve/pci_ahci.c
  projects/collation/usr.sbin/config/main.c
  projects/collation/usr.sbin/ctladm/ctladm.8
  projects/collation/usr.sbin/ctladm/ctladm.c
  projects/collation/usr.sbin/ctld/ctl.conf.5
  projects/collation/usr.sbin/ctld/kernel.c
  projects/collation/usr.sbin/fstyp/Makefile
  projects/collation/usr.sbin/fstyp/geli.c
  projects/collation/usr.sbin/hyperv/Makefile.inc
  projects/collation/usr.sbin/ndp/ndp.c
  projects/collation/usr.sbin/pkg/pkg.c
  projects/collation/usr.sbin/pw/pw_user.c
  projects/collation/usr.sbin/pw/strtounum.c
  projects/collation/usr.sbin/pw/tests/pw_useradd.sh
  projects/collation/usr.sbin/pwd_mkdb/pwd_mkdb.8
  projects/collation/usr.sbin/rtsold/probe.c
  projects/collation/usr.sbin/sysrc/sysrc.8
  projects/collation/usr.sbin/wake/wake.8
  projects/collation/usr.sbin/watchdogd/watchdogd.8
  projects/collation/usr.sbin/watchdogd/watchdogd.c
  projects/collation/usr.sbin/wlandebug/wlandebug.8
  projects/collation/usr.sbin/ypserv/Makefile
  projects/collation/usr.sbin/ypserv/Makefile.yp
  projects/collation/usr.sbin/ypserv/ypinit.8
  projects/collation/usr.sbin/ypserv/ypinit.sh
  projects/collation/usr.sbin/ypset/ypset.8
  projects/collation/usr.sbin/ypset/ypset.c
Directory Properties:
  projects/collation/   (props changed)
  projects/collation/cddl/   (props changed)
  projects/collation/cddl/contrib/opensolaris/   (props changed)
  projects/collation/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/collation/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/collation/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/collation/contrib/apr/   (props changed)
  projects/collation/contrib/binutils/   (props changed)
  projects/collation/contrib/compiler-rt/   (props changed)
  projects/collation/contrib/expat/   (props changed)
  projects/collation/contrib/serf/   (props changed)
  projects/collation/contrib/sqlite3/   (props changed)
  projects/collation/contrib/subversion/   (props changed)
  projects/collation/contrib/tzdata/   (props changed)
  projects/collation/etc/   (props changed)
  projects/collation/gnu/usr.bin/binutils/   (props changed)
  projects/collation/include/   (props changed)
  projects/collation/lib/libc/   (props changed)
  projects/collation/lib/libutil/   (props changed)
  projects/collation/sbin/   (props changed)
  projects/collation/sbin/ipfw/   (props changed)
  projects/collation/share/   (props changed)
  projects/collation/share/man/man4/   (props changed)
  projects/collation/share/zoneinfo/   (props changed)
  projects/collation/sys/   (props changed)
  projects/collation/sys/boot/   (props changed)
  projects/collation/sys/cddl/contrib/opensolaris/   (props changed)
  projects/collation/sys/conf/   (props changed)
  projects/collation/targets/   (props changed)
  projects/collation/usr.bin/calendar/   (props changed)
  projects/collation/usr.bin/mkimg/   (props changed)
  projects/collation/usr.sbin/bhyve/   (props changed)
  projects/collation/usr.sbin/rtsold/   (props changed)

Modified: projects/collation/Makefile.inc1
==============================================================================
--- projects/collation/Makefile.inc1	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/Makefile.inc1	Tue Aug 25 20:14:50 2015	(r287142)
@@ -219,11 +219,16 @@ INSTALLTMP!=	/usr/bin/mktemp -d -u -t in
 # 2. build-tools stage [TMAKE]
 #	This stage is responsible for creating the object
 #	tree and building any tools that are needed during
-#	the build process.
+#	the build process. Some programs are listed during
+#	this phase because they build binaries to generate
+#	files needed to build these programs. This stage also
+#	builds the 'build-tools' target rather than 'all'.
 # 3. cross-tools stage [XMAKE]
 #	This stage is responsible for creating any tools that
 #	are needed for building the system. A cross-compiler is one
-#	of them.
+#	of them. This differs from build tools in two ways:
+#	1. the 'all' target is built rather than 'build-tools'
+#	2. these tools are installed into TMPPATH for stage 4.
 # 4. world stage [WMAKE]
 #	This stage actually builds the world.
 # 5. install stage (optional) [IMAKE]
@@ -444,7 +449,6 @@ LIB32WMAKEENV+=	MAKEOBJDIRPREFIX=${LIB32
 		PATH=${TMPPATH} \
 		LIBDIR=/usr/lib32 \
 		SHLIBDIR=/usr/lib32 \
-		LIBPRIVATEDIR=/usr/lib32/private \
 		DTRACE="${DTRACE} -32"
 LIB32WMAKEFLAGS+= CC="${XCC} ${LIB32FLAGS}" \
 		CXX="${XCXX} ${LIB32FLAGS}" \
@@ -807,7 +811,7 @@ __installcheck_UGID:
 _zoneinfo=	zic tzsetup
 .endif
 
-ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
+ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb \
 	rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \
@@ -1225,16 +1229,23 @@ update:
 #
 
 #
-# legacy: Build compatibility shims for the next three targets. This is a minimal
-# set of tools and shims necessary to compensate for older systems which don't have
-# the APIs that the targets built in bootstrap-tools, build-tools or cross-tools.
+# legacy: Build compatibility shims for the next three targets. This is a
+# minimal set of tools and shims necessary to compensate for older systems
+# which don't have the APIs required by the targets built in bootstrap-tools,
+# build-tools or cross-tools.
 #
+
+# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
+.if ${BOOTSTRAPPING} < 1100006
+_elftoolchain_libs= lib/libelf lib/libdwarf 
+.endif
+
 legacy:
 .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
-.for _tool in tools/build
+.for _tool in tools/build ${_elftoolchain_libs}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool} && \
 	    ${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1297,7 +1308,8 @@ _lex=		usr.bin/lex
 
 # r277259 crunchide: Correct 64-bit section header offset
 # r281674 crunchide: always include both 32- and 64-bit ELF support
-.if ${BOOTSTRAPPING} < 1100071
+# r285986 crunchen: use STRIPBIN rather than STRIP
+.if ${BOOTSTRAPPING} < 1100078
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1332,13 +1344,12 @@ ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/
 # pre libdwarf
 .if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
     ${MACHINE_ARCH} != ${TARGET_ARCH})
-_elftoolchain_libs= lib/libelf lib/libdwarf 
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
     cddl/usr.bin/ctfmerge
 
-${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-lib/libelf ${_bt}-lib/libdwarf ${_bt}-cddl/lib/libctf
-${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-lib/libelf ${_bt}-lib/libdwarf ${_bt}-cddl/lib/libctf
+${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-cddl/lib/libctf
+${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-cddl/lib/libctf
 .endif
 .endif
 
@@ -1381,7 +1392,6 @@ bootstrap-tools: .PHONY
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
-    ${_elftoolchain_libs} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
@@ -1428,17 +1438,18 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
 .if ${MK_RESCUE} != "no"
-_rescue= rescue/rescue
+# rescue includes programs that have build-tools targets
+_rescue=rescue/rescue
 .endif
 
 build-tools: .MAKE
 .for _tool in \
     bin/csh \
     bin/sh \
-    ${_rescue} \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
+    ${_rescue} \
     ${_share} \
     usr.bin/awk \
     lib/libmagic \
@@ -1483,7 +1494,7 @@ _btxld=		usr.sbin/btxld
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/elfcopy \
 		usr.bin/nm \
@@ -1493,7 +1504,7 @@ _elftctools=	lib/libelftc \
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \
@@ -1767,9 +1778,7 @@ cddl/lib/libctf__L: lib/libz__L
 .endif
 # cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built
 # on select architectures though (see cddl/lib/Makefile)
-.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_ARCH} == "amd64" || \
-	${MACHINE_CPUARCH} == "arm" || ${MACHINE_ARCH} == "i386" || \
-	${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} != "sparc64"
 _prebuild_libs+=	lib/libproc lib/librtld_db
 .endif
 

Modified: projects/collation/ObsoleteFiles.inc
==============================================================================
--- projects/collation/ObsoleteFiles.inc	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/ObsoleteFiles.inc	Tue Aug 25 20:14:50 2015	(r287142)
@@ -39,10 +39,70 @@
 # done
 
 # 20150809: String collation improvements
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MONETARY
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_NUMERIC
+OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_TIME
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/kk_KZ.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-13/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-2/LC_TIME
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.ISO8859-4/LC_TIME
+OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_COLLATE
+OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_CTYPE
+OLD_FILES+=usr/share/locale/la_LN.US-ASCII/LC_TIME
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/mn_MN.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_COLLATE
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_CTYPE
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MESSAGES
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_MONETARY
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_NUMERIC
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-1/LC_TIME
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_COLLATE
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_CTYPE
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MESSAGES
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_MONETARY
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_NUMERIC
+OLD_FILES+=usr/share/locale/no_NO.ISO8859-15/LC_TIME
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_COLLATE
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_CTYPE
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MESSAGES
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_MONETARY
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_NUMERIC
+OLD_FILES+=usr/share/locale/no_NO.UTF-8/LC_TIME
+OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE
 OLD_FILES+=usr/bin/colldef
 OLD_FILES+=usr/share/man/man1/colldef.1.gz
 OLD_FILES+=usr/bin/mklocale
 OLD_FILES+=usr/share/man/man1/mklocale.1.gz
+# 20150818: *allocm() are gone in jemalloc 4.0.0
+OLD_FILES+=usr/share/man/man3/allocm.3.gz
+OLD_FILES+=usr/share/man/man3/dallocm.3.gz
+OLD_FILES+=usr/share/man/man3/nallocm.3.gz
+OLD_FILES+=usr/share/man/man3/rallocm.3.gz
+OLD_FILES+=usr/share/man/man3/sallocm.3.gz
 # 20150802: Remove netbsd's test on pw(8)
 OLD_FILES+=usr/tests/usr.sbin/pw/pw_test
 # 20150719: Remove libarchive.pc

Modified: projects/collation/UPDATING
==============================================================================
--- projects/collation/UPDATING	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/UPDATING	Tue Aug 25 20:14:50 2015	(r287142)
@@ -31,6 +31,48 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150817:
+	Kernel-loadable modules for the random(4) device are back. To use
+	them, the kernel must have
+
+	device	random
+	options	RANDOM_LOADABLE
+
+	kldload(8) can then be used to load random_fortuna.ko
+	or random_yarrow.ko. Please note that due to the indirect
+	function calls that the loadable modules need to provide,
+	the build-in variants will be slightly more efficient.
+
+	The random(4) kernel option RANDOM_DUMMY has been retired due to
+	unpopularity. It was not all that useful anyway.
+
+20150813:
+	The WITHOUT_ELFTOOLCHAIN_TOOLS src.conf(5) knob has been retired.
+	Control over building the ELF Tool Chain tools is now provided by
+	the WITHOUT_TOOLCHAIN knob.
+
+20150810:
+	The polarity of Pulse Per Second (PPS) capture events with the
+	uart(4) driver has been corrected.  Prior to this change the PPS
+	"assert" event corresponded to the trailing edge of a positive PPS
+	pulse and the "clear" event was the leading edge of the next pulse.
+
+	As the width of a PPS pulse in a typical GPS receiver is on the
+	order of 1 millisecond, most users will not notice any significant
+	difference with this change.
+
+	Anyone who has compensated for the historical polarity reversal by
+	configuring a negative offset equal to the pulse width will need to
+	remove that workaround.
+
+20150809:
+	The default group assigned to /dev/dri entries has been changed
+	from 'wheel' to 'video' with the id of '44'. If you want to have
+	access to the dri devices please add yourself to the video group
+	with:
+
+	# pw groupmod video -m $USER
+
 20150806:
 	The menu.rc and loader.rc files will now be replaced during 
 	upgrades. Please migrate local changes to menu.rc.local and

Modified: projects/collation/bin/ls/Makefile
==============================================================================
--- projects/collation/bin/ls/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/ls/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -5,7 +5,7 @@
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
-LIBADD=	util xo
+LIBADD=	xo util
 
 .if !defined(RELEASE_CRUNCH) && \
 	${MK_LS_COLORS} != no

Modified: projects/collation/bin/pkill/Makefile
==============================================================================
--- projects/collation/bin/pkill/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -5,7 +5,7 @@
 
 PROG=	pkill
 
-LIBADD=	kvm
+LIBADD=	kvm jail
 
 LINKS=	${BINDIR}/pkill ${BINDIR}/pgrep
 MLINKS=	pkill.1 pgrep.1

Modified: projects/collation/bin/pkill/Makefile.depend
==============================================================================
--- projects/collation/bin/pkill/Makefile.depend	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/Makefile.depend	Tue Aug 25 20:14:50 2015	(r287142)
@@ -9,6 +9,7 @@ DIRDEPS = \
 	lib/${CSU_DIR} \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/libjail \
 	lib/libkvm \
 
 

Modified: projects/collation/bin/pkill/pkill.1
==============================================================================
--- projects/collation/bin/pkill/pkill.1	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/pkill.1	Tue Aug 25 20:14:50 2015	(r287142)
@@ -29,7 +29,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 9, 2013
+.Dd August 21, 2015
 .Dt PKILL 1
 .Os
 .Sh NAME
@@ -47,7 +47,7 @@
 .Op Fl c Ar class
 .Op Fl d Ar delim
 .Op Fl g Ar pgrp
-.Op Fl j Ar jid
+.Op Fl j Ar jail
 .Op Fl s Ar sid
 .Op Fl t Ar tty
 .Op Fl u Ar euid
@@ -63,7 +63,7 @@
 .Op Fl U Ar uid
 .Op Fl c Ar class
 .Op Fl g Ar pgrp
-.Op Fl j Ar jid
+.Op Fl j Ar jail
 .Op Fl s Ar sid
 .Op Fl t Ar tty
 .Op Fl u Ar euid
@@ -149,16 +149,16 @@ or
 command.
 .It Fl i
 Ignore case distinctions in both the process table and the supplied pattern.
-.It Fl j Ar jid
-Restrict matches to processes inside jails with a jail ID in the comma-separated
-list
-.Ar jid .
-The value
+.It Fl j Ar jail
+Restrict matches to processes inside the specified jails.
+The argument
+.Ar jail
+may be
 .Dq Li any
-matches processes in any jail.
-The value
+to match processes in any jail,
 .Dq Li none
-matches processes not in jail.
+to match processes not in jail,
+or a comma-separated list of jail IDs or names.
 .It Fl l
 Long output.
 For

Modified: projects/collation/bin/pkill/pkill.c
==============================================================================
--- projects/collation/bin/pkill/pkill.c	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/pkill.c	Tue Aug 25 20:14:50 2015	(r287142)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <grp.h>
 #include <errno.h>
 #include <locale.h>
+#include <jail.h>
 
 #define	STATUS_MATCH	0
 #define	STATUS_NOMATCH	1
@@ -78,7 +79,7 @@ enum listtype {
 	LT_GROUP,
 	LT_TTY,
 	LT_PGRP,
-	LT_JID,
+	LT_JAIL,
 	LT_SID,
 	LT_CLASS
 };
@@ -245,7 +246,7 @@ main(int argc, char **argv)
 			cflags |= REG_ICASE;
 			break;
 		case 'j':
-			makelist(&jidlist, LT_JID, optarg);
+			makelist(&jidlist, LT_JAIL, optarg);
 			criteria = 1;
 			break;
 		case 'l':
@@ -585,7 +586,7 @@ usage(void)
 
 	fprintf(stderr,
 		"usage: %s %s [-F pidfile] [-G gid] [-M core] [-N system]\n"
-		"             [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jid]\n"
+		"             [-P ppid] [-U uid] [-c class] [-g pgrp] [-j jail]\n"
 		"             [-s sid] [-t tty] [-u euid] pattern ...\n",
 		getprogname(), ustr);
 
@@ -700,7 +701,7 @@ makelist(struct listhead *head, enum lis
 				if (li->li_number == 0)
 					li->li_number = getsid(mypid);
 				break;
-			case LT_JID:
+			case LT_JAIL:
 				if (li->li_number < 0)
 					errx(STATUS_BADUSAGE,
 					     "Negative jail ID `%s'", sp);
@@ -766,15 +767,20 @@ foundtty:		if ((st.st_mode & S_IFCHR) ==
 
 			li->li_number = st.st_rdev;
 			break;
-		case LT_JID:
+		case LT_JAIL: {
+			int jid;
+
 			if (strcmp(sp, "none") == 0)
 				li->li_number = 0;
 			else if (strcmp(sp, "any") == 0)
 				li->li_number = -1;
+			else if ((jid = jail_getid(sp)) != -1)
+				li->li_number = jid;
 			else if (*ep != '\0')
 				errx(STATUS_BADUSAGE,
-				     "Invalid jail ID `%s'", sp);
+				     "Invalid jail ID or name `%s'", sp);
 			break;
+		}
 		case LT_CLASS:
 			li->li_number = -1;
 			li->li_name = strdup(sp);

Modified: projects/collation/bin/pkill/tests/pgrep-j_test.sh
==============================================================================
--- projects/collation/bin/pkill/tests/pgrep-j_test.sh	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/tests/pgrep-j_test.sh	Tue Aug 25 20:14:50 2015	(r287142)
@@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then
 	exit 0
 fi
 
-echo "1..3"
+echo "1..4"
 
 sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
@@ -87,5 +87,30 @@ else
 fi
 [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) 
 [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) 
+wait
+
+# test 4 is like test 1 except with jname instead of jid.
+name="pgrep -j <jname>"
+sleep_amount=8
+jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount &
+
+sleep 0.5
+
+jname="${base}_4_1,${base}_4_2"
+pid1="$(pgrep -f -x -j "$jname" "$sleep $sleep_amount" | sort)"
+pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_4_1.pid)" \
+    $(cat ${PWD}/${base}_4_2.pid) | sort)
+if [ "$pid1" = "$pid2" ]; then
+	echo "ok 4 - $name"
+else
+	echo "not ok 4 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'"
+fi
+[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid)
+[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid)
+wait
 
 rm -f $sleep

Modified: projects/collation/bin/pkill/tests/pkill-j_test.sh
==============================================================================
--- projects/collation/bin/pkill/tests/pkill-j_test.sh	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/pkill/tests/pkill-j_test.sh	Tue Aug 25 20:14:50 2015	(r287142)
@@ -14,7 +14,7 @@ if [ `id -u` -ne 0 ]; then
 	exit 0
 fi
 
-echo "1..3"
+echo "1..4"
 
 sleep=$(pwd)/sleep.txt
 ln -sf /bin/sleep $sleep
@@ -90,5 +90,31 @@ else
 fi 2>/dev/null
 [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat ${base}_3_1.pid)
 [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat ${base}_3_2.pid)
+wait
+
+# test 4 is like test 1 except with jname instead of jid.
+name="pkill -j <jname>"
+sleep_amount=8
+jail -c path=/ name=${base}_4_1 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_4_1.pid $sleep $sleep_amount &
+
+jail -c path=/ name=${base}_4_2 ip4.addr=127.0.0.1 \
+    command=daemon -p ${PWD}/${base}_4_2.pid $sleep $sleep_amount &
+
+$sleep $sleep_amount &
+
+sleep 0.5
+
+jname="${base}_4_1,${base}_4_2"
+if pkill -f -j "$jname" $sleep && sleep 0.5 &&
+    ! -f ${PWD}/${base}_4_1.pid &&
+    ! -f ${PWD}/${base}_4_2.pid ; then
+	echo "ok 4 - $name"
+else
+	echo "not ok 4 - $name"
+fi 2>/dev/null
+[ -f ${PWD}/${base}_4_1.pid ] && kill $(cat ${PWD}/${base}_4_1.pid)
+[ -f ${PWD}/${base}_4_2.pid ] && kill $(cat ${PWD}/${base}_4_2.pid)
+wait
 
 rm -f $sleep

Modified: projects/collation/bin/ps/Makefile
==============================================================================
--- projects/collation/bin/ps/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/ps/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -11,6 +11,6 @@ SRCS=	fmt.c keyword.c nlist.c print.c ps
 # on large systems.
 #
 CFLAGS+=-DLAZY_PS
-LIBADD=	m kvm jail xo
+LIBADD=	m kvm jail xo util
 
 .include <bsd.prog.mk>

Modified: projects/collation/bin/sh/miscbltin.c
==============================================================================
--- projects/collation/bin/sh/miscbltin.c	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/miscbltin.c	Tue Aug 25 20:14:50 2015	(r287142)
@@ -191,9 +191,10 @@ readcmd(int argc __unused, char **argv _
 		CHECKSTRSPACE(1, p);
 		if (backslash) {
 			backslash = 0;
-			startword = 0;
-			if (c != '\n')
+			if (c != '\n') {
+				startword = 0;
 				USTPUTC(c, p);
+			}
 			continue;
 		}
 		if (!rflag && c == '\\') {

Modified: projects/collation/bin/sh/options.c
==============================================================================
--- projects/collation/bin/sh/options.c	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/options.c	Tue Aug 25 20:14:50 2015	(r287142)
@@ -73,6 +73,7 @@ char *minusc;			/* argument to -c option
 static void options(int);
 static void minus_o(char *, int);
 static void setoption(int, int);
+static void setoptionbyindex(int, int);
 static int getopts(char *, char *, char **, char ***, char **);
 
 
@@ -269,7 +270,7 @@ minus_o(char *name, int val)
 	} else {
 		for (i = 0; i < NOPTS; i++)
 			if (equal(name, optlist[i].name)) {
-				setoption(optlist[i].letter, val);
+				setoptionbyindex(i, val);
 				return;
 			}
 		error("Illegal option -o %s", name);
@@ -278,26 +279,32 @@ minus_o(char *name, int val)
 
 
 static void
-setoption(int flag, int val)
+setoptionbyindex(int idx, int val)
 {
-	int i;
-
-	if (flag == 'p' && !val && privileged) {
+	if (optlist[idx].letter == 'p' && !val && privileged) {
 		if (setgid(getgid()) == -1)
 			error("setgid");
 		if (setuid(getuid()) == -1)
 			error("setuid");
 	}
+	optlist[idx].val = val;
+	if (val) {
+		/* #%$ hack for ksh semantics */
+		if (optlist[idx].letter == 'V')
+			Eflag = 0;
+		else if (optlist[idx].letter == 'E')
+			Vflag = 0;
+	}
+}
+
+static void
+setoption(int flag, int val)
+{
+	int i;
+
 	for (i = 0; i < NOPTS; i++)
 		if (optlist[i].letter == flag) {
-			optlist[i].val = val;
-			if (val) {
-				/* #%$ hack for ksh semantics */
-				if (flag == 'V')
-					Eflag = 0;
-				else if (flag == 'E')
-					Vflag = 0;
-			}
+			setoptionbyindex(i, val);
 			return;
 		}
 	error("Illegal option -%c", flag);

Modified: projects/collation/bin/sh/parser.c
==============================================================================
--- projects/collation/bin/sh/parser.c	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/parser.c	Tue Aug 25 20:14:50 2015	(r287142)
@@ -1195,7 +1195,8 @@ parsebackq(char *out, struct nodelist **
 static char *
 readcstyleesc(char *out)
 {
-	int c, v, i, n;
+	int c, vc, i, n;
+	unsigned int v;
 
 	c = pgetc();
 	switch (c) {
@@ -1310,12 +1311,12 @@ readcstyleesc(char *out)
 	default:
 		  synerror("Bad escape sequence");
 	}
-	v = (char)v;
+	vc = (char)v;
 	/*
 	 * We can't handle NUL bytes.
 	 * POSIX says we should skip till the closing quote.
 	 */
-	if (v == '\0') {
+	if (vc == '\0') {
 		while ((c = pgetc()) != '\'') {
 			if (c == '\\')
 				c = pgetc();
@@ -1332,9 +1333,9 @@ readcstyleesc(char *out)
 		pungetc();
 		return out;
 	}
-	if (SQSYNTAX[v] == CCTL)
+	if (SQSYNTAX[vc] == CCTL)
 		USTPUTC(CTLESC, out);
-	USTPUTC(v, out);
+	USTPUTC(vc, out);
 	return out;
 }
 
@@ -1661,7 +1662,7 @@ varname:
 				pungetc();
 			else if (c == '\n' || c == PEOF)
 				synerror("Unexpected end of line in substitution");
-			else
+			else if (BASESYNTAX[c] != CCTL)
 				USTPUTC(c, out);
 		}
 		if (subtype == 0) {
@@ -1677,7 +1678,8 @@ varname:
 						synerror("Unexpected end of line in substitution");
 					if (flags == VSNUL)
 						STPUTC(':', out);
-					STPUTC(c, out);
+					if (BASESYNTAX[c] != CCTL)
+						STPUTC(c, out);
 					subtype = VSERROR;
 				} else
 					subtype = p - types + VSNORMAL;

Modified: projects/collation/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/collation/bin/sh/tests/builtins/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/tests/builtins/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -121,6 +121,7 @@ FILES+=		read4.0 read4.0.stdout
 FILES+=		read5.0
 FILES+=		read6.0
 FILES+=		read7.0
+FILES+=		read8.0
 FILES+=		return1.0
 FILES+=		return2.1
 FILES+=		return3.1

Copied: projects/collation/bin/sh/tests/builtins/read8.0 (from r287141, head/bin/sh/tests/builtins/read8.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/collation/bin/sh/tests/builtins/read8.0	Tue Aug 25 20:14:50 2015	(r287142, copy of r287141, head/bin/sh/tests/builtins/read8.0)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+read a b c <<\EOF
+\
+A\
+ \
+ \
+ \
+B\
+ \
+ \
+C\
+ \
+ \
+ \
+EOF
+[ "$a.$b.$c" = "A.B.C" ]

Modified: projects/collation/bin/sh/tests/errors/Makefile
==============================================================================
--- projects/collation/bin/sh/tests/errors/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/tests/errors/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -19,6 +19,8 @@ FILES+=		bad-parm-exp3.2 bad-parm-exp3.2
 FILES+=		bad-parm-exp4.2 bad-parm-exp4.2.stderr
 FILES+=		bad-parm-exp5.2 bad-parm-exp5.2.stderr
 FILES+=		bad-parm-exp6.2 bad-parm-exp6.2.stderr
+FILES+=		bad-parm-exp7.0
+FILES+=		bad-parm-exp8.0
 FILES+=		option-error.0
 FILES+=		redirection-error.0
 FILES+=		redirection-error2.2

Copied: projects/collation/bin/sh/tests/errors/bad-parm-exp7.0 (from r287141, head/bin/sh/tests/errors/bad-parm-exp7.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/collation/bin/sh/tests/errors/bad-parm-exp7.0	Tue Aug 25 20:14:50 2015	(r287142, copy of r287141, head/bin/sh/tests/errors/bad-parm-exp7.0)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+v=1
+eval ": $(printf '${v-${\372}}')"

Copied: projects/collation/bin/sh/tests/errors/bad-parm-exp8.0 (from r287141, head/bin/sh/tests/errors/bad-parm-exp8.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/collation/bin/sh/tests/errors/bad-parm-exp8.0	Tue Aug 25 20:14:50 2015	(r287142, copy of r287141, head/bin/sh/tests/errors/bad-parm-exp8.0)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+v=1
+eval ": $(printf '${v-${w\372}}')"

Modified: projects/collation/bin/sh/tests/parser/Makefile
==============================================================================
--- projects/collation/bin/sh/tests/parser/Makefile	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/bin/sh/tests/parser/Makefile	Tue Aug 25 20:14:50 2015	(r287142)
@@ -36,6 +36,8 @@ FILES+=		dollar-quote8.0
 FILES+=		dollar-quote9.0
 FILES+=		dollar-quote10.0
 FILES+=		dollar-quote11.0
+FILES+=		dollar-quote12.0
+FILES+=		dollar-quote13.0
 FILES+=		empty-braces1.0
 FILES+=		empty-cmd1.0
 FILES+=		for1.0

Copied: projects/collation/bin/sh/tests/parser/dollar-quote12.0 (from r287141, head/bin/sh/tests/parser/dollar-quote12.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/collation/bin/sh/tests/parser/dollar-quote12.0	Tue Aug 25 20:14:50 2015	(r287142, copy of r287141, head/bin/sh/tests/parser/dollar-quote12.0)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+# \u without any digits at all remains invalid.
+# Our choice is a parse error.
+
+v=$( (eval ": \$'\u'") 2>&1 >/dev/null)
+[ $? -ne 0 ] && [ -n "$v" ]

Copied: projects/collation/bin/sh/tests/parser/dollar-quote13.0 (from r287141, head/bin/sh/tests/parser/dollar-quote13.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/collation/bin/sh/tests/parser/dollar-quote13.0	Tue Aug 25 20:14:50 2015	(r287142, copy of r287141, head/bin/sh/tests/parser/dollar-quote13.0)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+# This Unicode escape sequence that has never been in range should either
+# fail to expand or expand to a fallback.
+
+c=$(eval printf %s \$\'\\Uffffff41\' 2>/dev/null)
+r=$(($? != 0))
+[ "$r.$c" = '1.' ] || [ "$r.$c" = '0.?' ] || [ "$r.$c" = $'0.\u2222' ]

Modified: projects/collation/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/collation/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Aug 25 19:41:43 2015	(r287141)
+++ projects/collation/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Aug 25 20:14:50 2015	(r287142)
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -95,6 +95,8 @@ static int zopt_objects = 0;
 static libzfs_handle_t *g_zfs;
 static uint64_t max_inflight = 1000;
 
+static void snprintf_blkptr_compact(char *, size_t, const blkptr_t *);
+
 /*
  * These libumem hooks provide a reasonable set of defaults for the allocator's
  * debugging facilities.
@@ -418,6 +420,79 @@ dump_zap(objset_t *os, uint64_t object, 
 	zap_cursor_fini(&zc);
 }
 
+static void
+dump_bpobj(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	bpobj_phys_t *bpop = data;
+	char bytes[32], comp[32], uncomp[32];
+
+	if (bpop == NULL)
+		return;
+
+	zdb_nicenum(bpop->bpo_bytes, bytes);
+	zdb_nicenum(bpop->bpo_comp, comp);
+	zdb_nicenum(bpop->bpo_uncomp, uncomp);
+
+	(void) printf("\t\tnum_blkptrs = %llu\n",
+	    (u_longlong_t)bpop->bpo_num_blkptrs);
+	(void) printf("\t\tbytes = %s\n", bytes);
+	if (size >= BPOBJ_SIZE_V1) {
+		(void) printf("\t\tcomp = %s\n", comp);
+		(void) printf("\t\tuncomp = %s\n", uncomp);
+	}
+	if (size >= sizeof (*bpop)) {
+		(void) printf("\t\tsubobjs = %llu\n",
+		    (u_longlong_t)bpop->bpo_subobjs);
+		(void) printf("\t\tnum_subobjs = %llu\n",
+		    (u_longlong_t)bpop->bpo_num_subobjs);
+	}
+
+	if (dump_opt['d'] < 5)
+		return;
+
+	for (uint64_t i = 0; i < bpop->bpo_num_blkptrs; i++) {
+		char blkbuf[BP_SPRINTF_LEN];
+		blkptr_t bp;
+
+		int err = dmu_read(os, object,
+		    i * sizeof (bp), sizeof (bp), &bp, 0);
+		if (err != 0) {
+			(void) printf("got error %u from dmu_read\n", err);
+			break;
+		}
+		snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), &bp);
+		(void) printf("\t%s\n", blkbuf);
+	}
+}
+
+/* ARGSUSED */
+static void
+dump_bpobj_subobjs(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	dmu_object_info_t doi;
+
+	VERIFY0(dmu_object_info(os, object, &doi));
+	uint64_t *subobjs = kmem_alloc(doi.doi_max_offset, KM_SLEEP);
+
+	int err = dmu_read(os, object, 0, doi.doi_max_offset, subobjs, 0);
+	if (err != 0) {
+		(void) printf("got error %u from dmu_read\n", err);
+		kmem_free(subobjs, doi.doi_max_offset);
+		return;
+	}
+
+	int64_t last_nonzero = -1;
+	for (uint64_t i = 0; i < doi.doi_max_offset / 8; i++) {
+		if (subobjs[i] != 0)
+			last_nonzero = i;
+	}
+
+	for (int64_t i = 0; i <= last_nonzero; i++) {
+		(void) printf("\t%llu\n", (longlong_t)subobjs[i]);
+	}
+	kmem_free(subobjs, doi.doi_max_offset);
+}
+
 /*ARGSUSED*/
 static void
 dump_ddt_zap(objset_t *os, uint64_t object, void *data, size_t size)
@@ -1397,7 +1472,7 @@ dump_bpobj_cb(void *arg, const blkptr_t 
 }
 
 static void
-dump_bpobj(bpobj_t *bpo, char *name, int indent)
+dump_full_bpobj(bpobj_t *bpo, char *name, int indent)
 {
 	char bytes[32];
 	char comp[32];
@@ -1411,11 +1486,12 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 		zdb_nicenum(bpo->bpo_phys->bpo_comp, comp);
 		zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp);
 		(void) printf("    %*s: object %llu, %llu local blkptrs, "
-		    "%llu subobjs, %s (%s/%s comp)\n",
+		    "%llu subobjs in object %llu, %s (%s/%s comp)\n",
 		    indent * 8, name,
 		    (u_longlong_t)bpo->bpo_object,
 		    (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs,
 		    (u_longlong_t)bpo->bpo_phys->bpo_num_subobjs,
+		    (u_longlong_t)bpo->bpo_phys->bpo_subobjs,
 		    bytes, comp, uncomp);
 
 		for (uint64_t i = 0; i < bpo->bpo_phys->bpo_num_subobjs; i++) {
@@ -1432,7 +1508,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 				    error, (u_longlong_t)subobj);
 				continue;
 			}
-			dump_bpobj(&subbpo, "subobj", indent + 1);
+			dump_full_bpobj(&subbpo, "subobj", indent + 1);
 			bpobj_close(&subbpo);
 		}
 	} else {
@@ -1466,7 +1542,7 @@ dump_deadlist(dsl_deadlist_t *dl)
 		return;
 
 	if (dl->dl_oldfmt) {
-		dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+		dump_full_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
 		return;
 	}
 
@@ -1491,7 +1567,7 @@ dump_deadlist(dsl_deadlist_t *dl)
 			(void) snprintf(buf, sizeof (buf), "mintxg %llu -> "
 			    "obj %llu", (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);
-			dump_bpobj(&dle->dle_bpobj, buf, 0);
+			dump_full_bpobj(&dle->dle_bpobj, buf, 0);
 		} else {
 			(void) printf("mintxg %llu -> obj %llu\n",
 			    (longlong_t)dle->dle_mintxg,
@@ -1682,8 +1758,8 @@ static object_viewer_t *object_viewer[DM
 	dump_uint64,		/* object array			*/
 	dump_none,		/* packed nvlist		*/
 	dump_packed_nvlist,	/* packed nvlist size		*/
-	dump_none,		/* bplist			*/
-	dump_none,		/* bplist header		*/
+	dump_none,		/* bpobj			*/
+	dump_bpobj,		/* bpobj header			*/
 	dump_none,		/* SPA space map header		*/
 	dump_none,		/* SPA space map		*/
 	dump_none,		/* ZIL intent log		*/
@@ -1730,7 +1806,7 @@ static object_viewer_t *object_viewer[DM
 	dump_zap,		/* deadlist			*/
 	dump_none,		/* deadlist hdr			*/
 	dump_zap,		/* dsl clones			*/
-	dump_none,		/* bpobj subobjs		*/
+	dump_bpobj_subobjs,	/* bpobj subobjs		*/
 	dump_unknown,		/* Unknown type, must be last	*/
 };
 
@@ -2145,7 +2221,7 @@ dump_label(const char *dev)
 	(void) close(fd);
 }
 
-static uint64_t num_large_blocks;
+static uint64_t dataset_feature_count[SPA_FEATURES];
 
 /*ARGSUSED*/
 static int
@@ -2159,8 +2235,15 @@ dump_one_dir(const char *dsname, void *a
 		(void) printf("Could not open %s, error %d\n", dsname, error);
 		return (0);
 	}
-	if (dmu_objset_ds(os)->ds_large_blocks)
-		num_large_blocks++;
+
+	for (spa_feature_t f = 0; f < SPA_FEATURES; f++) {
+		if (!dmu_objset_ds(os)->ds_feature_inuse[f])
+			continue;
+		ASSERT(spa_feature_table[f].fi_flags &
+		    ZFEATURE_FLAG_PER_DATASET);
+		dataset_feature_count[f]++;
+	}
+
 	dump_dir(os);
 	dmu_objset_disown(os, FTAG);
 	fuid_table_destroy();
@@ -2352,6 +2435,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 	dmu_object_type_t type;
 	boolean_t is_metadata;
 
+	if (bp == NULL)
+		return (0);
+
 	if (dump_opt['b'] >= 5 && bp->blk_birth > 0) {
 		char blkbuf[BP_SPRINTF_LEN];
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), bp);
@@ -2841,7 +2927,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo
 	avl_index_t where;
 	zdb_ddt_entry_t *zdde, zdde_search;
 
-	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
+	if (bp == NULL || BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) {
@@ -2956,13 +3042,13 @@ dump_zpool(spa_t *spa)
 		dump_metaslab_groups(spa);
 
 	if (dump_opt['d'] || dump_opt['i']) {
-		uint64_t refcount;
 		dump_dir(dp->dp_meta_objset);
 		if (dump_opt['d'] >= 3) {
-			dump_bpobj(&spa->spa_deferred_bpobj,
+			dump_full_bpobj(&spa->spa_deferred_bpobj,
 			    "Deferred frees", 0);
 			if (spa_version(spa) >= SPA_VERSION_DEADLISTS) {
-				dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj,
+				dump_full_bpobj(
+				    &spa->spa_dsl_pool->dp_free_bpobj,
 				    "Pool snapshot frees", 0);
 			}
 
@@ -2977,17 +3063,29 @@ dump_zpool(spa_t *spa)
 		(void) dmu_objset_find(spa_name(spa), dump_one_dir,
 		    NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN);
 
-		(void) feature_get_refcount(spa,
-		    &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount);
-		if (num_large_blocks != refcount) {
-			(void) printf("large_blocks feature refcount mismatch: "
-			    "expected %lld != actual %lld\n",
-			    (longlong_t)num_large_blocks,
-			    (longlong_t)refcount);
-			rc = 2;
-		} else {
-			(void) printf("Verified large_blocks feature refcount "
-			    "is correct (%llu)\n", (longlong_t)refcount);
+		for (spa_feature_t f = 0; f < SPA_FEATURES; f++) {
+			uint64_t refcount;
+
+			if (!(spa_feature_table[f].fi_flags &

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508252014.t7PKEsAY037339>