svn commit: r237213 - in projects/calloutng: . bin/rcp cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest cddl...

Davide Italiano davide at FreeBSD.org
Sun Jun 17 21:48:44 UTC 2012 

Author: davide
Date: Sun Jun 17 21:48:40 2012
New Revision: 237213
URL: http://svn.freebsd.org/changeset/base/237213

Log:
  MFC as per r237201.

Added:
  projects/calloutng/cddl/contrib/opensolaris/cmd/zhack/
     - copied from r237202, head/cddl/contrib/opensolaris/cmd/zhack/
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
     - copied unchanged from r237202, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5
  projects/calloutng/cddl/lib/libdtrace/io.d
     - copied unchanged from r237202, head/cddl/lib/libdtrace/io.d
  projects/calloutng/cddl/usr.sbin/zhack/
     - copied from r237202, head/cddl/usr.sbin/zhack/
  projects/calloutng/share/man/man4/filemon.4
     - copied unchanged from r237202, head/share/man/man4/filemon.4
  projects/calloutng/sys/arm/include/atags.h
     - copied unchanged from r237202, head/sys/arm/include/atags.h
  projects/calloutng/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/common/nvpair/fnvpair.c
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
     - copied unchanged from r237202, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  projects/calloutng/sys/dev/filemon/
     - copied from r237202, head/sys/dev/filemon/
  projects/calloutng/sys/kern/kern_rangelock.c
     - copied unchanged from r237202, head/sys/kern/kern_rangelock.c
  projects/calloutng/sys/modules/filemon/
     - copied from r237202, head/sys/modules/filemon/
  projects/calloutng/sys/powerpc/booke/machdep_e500.c
     - copied unchanged from r237202, head/sys/powerpc/booke/machdep_e500.c
  projects/calloutng/sys/powerpc/booke/machdep_ppc4xx.c
     - copied unchanged from r237202, head/sys/powerpc/booke/machdep_ppc4xx.c
  projects/calloutng/sys/powerpc/include/machdep.h
     - copied unchanged from r237202, head/sys/powerpc/include/machdep.h
  projects/calloutng/sys/sys/rangelock.h
     - copied unchanged from r237202, head/sys/sys/rangelock.h
  projects/calloutng/sys/x86/acpica/acpi_wakeup.c
     - copied unchanged from r237202, head/sys/x86/acpica/acpi_wakeup.c
  projects/calloutng/tools/build/make_check/check.mk
     - copied unchanged from r237202, head/tools/build/make_check/check.mk
  projects/calloutng/tools/regression/filemon/
     - copied from r237202, head/tools/regression/filemon/
  projects/calloutng/tools/regression/usr.bin/make/test-new.mk
     - copied unchanged from r237202, head/tools/regression/usr.bin/make/test-new.mk
  projects/calloutng/tools/regression/usr.bin/make/variables/modifier_t/
     - copied from r237202, head/tools/regression/usr.bin/make/variables/modifier_t/
  projects/calloutng/tools/regression/usr.bin/make/variables/opt_V/
     - copied from r237202, head/tools/regression/usr.bin/make/variables/opt_V/
  projects/calloutng/tools/tools/ath/athaggrstats/
     - copied from r237202, head/tools/tools/ath/athaggrstats/
  projects/calloutng/tools/tools/ifpifa/
     - copied from r237202, head/tools/tools/ifpifa/
  projects/calloutng/usr.sbin/pciconf/err.c
     - copied unchanged from r237202, head/usr.sbin/pciconf/err.c
Deleted:
  projects/calloutng/etc/auth.conf
  projects/calloutng/lib/libutil/auth.3
  projects/calloutng/lib/libutil/auth.conf.5
  projects/calloutng/sys/amd64/acpica/acpi_switch.S
  projects/calloutng/sys/amd64/acpica/acpi_wakeup.c
  projects/calloutng/sys/arm/at91/files.at91sam9
  projects/calloutng/sys/i386/acpica/acpi_wakeup.c
Modified:
  projects/calloutng/Makefile.inc1
  projects/calloutng/ObsoleteFiles.inc
  projects/calloutng/UPDATING
  projects/calloutng/bin/rcp/rcp.1
  projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/calloutng/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/calloutng/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  projects/calloutng/cddl/lib/libnvpair/Makefile
  projects/calloutng/cddl/lib/libzfs/Makefile
  projects/calloutng/cddl/sbin/zpool/Makefile
  projects/calloutng/cddl/usr.bin/ztest/Makefile
  projects/calloutng/cddl/usr.sbin/Makefile
  projects/calloutng/contrib/bind9/CHANGES
  projects/calloutng/contrib/bind9/lib/dns/rdata.c
  projects/calloutng/contrib/bind9/lib/dns/rdataslab.c
  projects/calloutng/contrib/bind9/version
  projects/calloutng/contrib/bsnmp/lib/bsnmpclient.3
  projects/calloutng/contrib/bsnmp/lib/bsnmplib.3
  projects/calloutng/contrib/bsnmp/snmp_mibII/mibII_tcp.c
  projects/calloutng/contrib/bsnmp/snmp_target/snmp_target.3
  projects/calloutng/contrib/bsnmp/snmp_usm/snmp_usm.3
  projects/calloutng/contrib/bsnmp/snmp_vacm/snmp_vacm.3
  projects/calloutng/contrib/gcc/config/arm/freebsd.h
  projects/calloutng/contrib/gcc/config/sparc/freebsd.h
  projects/calloutng/contrib/libc++/include/__bit_reference
  projects/calloutng/contrib/libstdc++/include/bits/locale_facets.tcc
  projects/calloutng/contrib/libstdc++/include/bits/stl_bvector.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_deque.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_list.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_map.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_multimap.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_multiset.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_set.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_tree.h
  projects/calloutng/contrib/libstdc++/include/bits/stl_vector.h
  projects/calloutng/contrib/llvm/tools/bugpoint/ToolRunner.cpp
  projects/calloutng/contrib/telnet/telnet/telnet.1
  projects/calloutng/etc/Makefile
  projects/calloutng/gnu/lib/libgomp/config.h
  projects/calloutng/gnu/lib/libstdc++/config.h
  projects/calloutng/gnu/lib/libsupc++/Version.map
  projects/calloutng/include/fmtmsg.h
  projects/calloutng/include/paths.h
  projects/calloutng/kerberos5/Makefile.inc
  projects/calloutng/kerberos5/lib/libasn1/Makefile
  projects/calloutng/kerberos5/lib/libgssapi_krb5/Makefile
  projects/calloutng/kerberos5/lib/libgssapi_ntlm/Makefile
  projects/calloutng/kerberos5/lib/libgssapi_spnego/Makefile
  projects/calloutng/kerberos5/lib/libhdb/Makefile
  projects/calloutng/kerberos5/lib/libheimbase/Makefile
  projects/calloutng/kerberos5/lib/libheimipcc/Makefile
  projects/calloutng/kerberos5/lib/libheimipcs/Makefile
  projects/calloutng/kerberos5/lib/libhx509/Makefile
  projects/calloutng/kerberos5/lib/libkadm5clnt/Makefile
  projects/calloutng/kerberos5/lib/libkadm5srv/Makefile
  projects/calloutng/kerberos5/lib/libkafs5/Makefile
  projects/calloutng/kerberos5/lib/libkdc/Makefile
  projects/calloutng/kerberos5/lib/libkrb5/Makefile
  projects/calloutng/kerberos5/lib/libroken/Makefile
  projects/calloutng/kerberos5/lib/libvers/Makefile
  projects/calloutng/kerberos5/libexec/hprop/Makefile
  projects/calloutng/kerberos5/libexec/kadmind/Makefile
  projects/calloutng/kerberos5/libexec/kcm/Makefile
  projects/calloutng/kerberos5/libexec/kdigest/Makefile
  projects/calloutng/kerberos5/libexec/kfd/Makefile
  projects/calloutng/kerberos5/tools/asn1_compile/Makefile
  projects/calloutng/kerberos5/tools/slc/Makefile
  projects/calloutng/kerberos5/usr.bin/hxtool/Makefile
  projects/calloutng/kerberos5/usr.bin/kadmin/Makefile
  projects/calloutng/kerberos5/usr.bin/kcc/Makefile
  projects/calloutng/kerberos5/usr.bin/kf/Makefile
  projects/calloutng/kerberos5/usr.bin/string2key/Makefile
  projects/calloutng/kerberos5/usr.sbin/iprop-log/Makefile
  projects/calloutng/kerberos5/usr.sbin/ktutil/Makefile
  projects/calloutng/lib/libc++/Makefile
  projects/calloutng/lib/libc/arm/Symbol.map
  projects/calloutng/lib/libc/gen/fstab.c
  projects/calloutng/lib/libc/gen/getnetgrent.c
  projects/calloutng/lib/libc/gen/posix_spawnattr_getflags.3
  projects/calloutng/lib/libc/gen/signal.3
  projects/calloutng/lib/libc/include/port_before.h
  projects/calloutng/lib/libc/locale/setrunelocale.c
  projects/calloutng/lib/libc/net/getaddrinfo.c
  projects/calloutng/lib/libc/stdlib/getopt_long.c
  projects/calloutng/lib/libc/stdlib/realpath.c
  projects/calloutng/lib/libc/sys/stat.2
  projects/calloutng/lib/libcrypt/Makefile
  projects/calloutng/lib/libcrypt/crypt.3
  projects/calloutng/lib/libcrypt/crypt.c
  projects/calloutng/lib/libcxxrt/Makefile
  projects/calloutng/lib/libcxxrt/Version.map
  projects/calloutng/lib/libelf/elf.3
  projects/calloutng/lib/libelf/elf_begin.3
  projects/calloutng/lib/libelf/gelf.3
  projects/calloutng/lib/libgpib/gpib.3
  projects/calloutng/lib/libgssapi/gss_accept_sec_context.3
  projects/calloutng/lib/libgssapi/gss_acquire_cred.3
  projects/calloutng/lib/libgssapi/gss_add_cred.3
  projects/calloutng/lib/libgssapi/gss_add_oid_set_member.3
  projects/calloutng/lib/libgssapi/gss_canonicalize_name.3
  projects/calloutng/lib/libgssapi/gss_compare_name.3
  projects/calloutng/lib/libgssapi/gss_context_time.3
  projects/calloutng/lib/libgssapi/gss_create_empty_oid_set.3
  projects/calloutng/lib/libgssapi/gss_delete_sec_context.3
  projects/calloutng/lib/libgssapi/gss_display_name.3
  projects/calloutng/lib/libgssapi/gss_display_status.3
  projects/calloutng/lib/libgssapi/gss_duplicate_name.3
  projects/calloutng/lib/libgssapi/gss_export_name.3
  projects/calloutng/lib/libgssapi/gss_export_sec_context.3
  projects/calloutng/lib/libgssapi/gss_get_mic.3
  projects/calloutng/lib/libgssapi/gss_import_name.3
  projects/calloutng/lib/libgssapi/gss_import_sec_context.3
  projects/calloutng/lib/libgssapi/gss_indicate_mechs.3
  projects/calloutng/lib/libgssapi/gss_init_sec_context.3
  projects/calloutng/lib/libgssapi/gss_inquire_context.3
  projects/calloutng/lib/libgssapi/gss_inquire_cred.3
  projects/calloutng/lib/libgssapi/gss_inquire_cred_by_mech.3
  projects/calloutng/lib/libgssapi/gss_inquire_mechs_for_name.3
  projects/calloutng/lib/libgssapi/gss_inquire_names_for_mech.3
  projects/calloutng/lib/libgssapi/gss_process_context_token.3
  projects/calloutng/lib/libgssapi/gss_release_buffer.3
  projects/calloutng/lib/libgssapi/gss_release_cred.3
  projects/calloutng/lib/libgssapi/gss_release_name.3
  projects/calloutng/lib/libgssapi/gss_release_oid_set.3
  projects/calloutng/lib/libgssapi/gss_test_oid_set_member.3
  projects/calloutng/lib/libgssapi/gss_unwrap.3
  projects/calloutng/lib/libgssapi/gss_verify_mic.3
  projects/calloutng/lib/libgssapi/gss_wrap.3
  projects/calloutng/lib/libgssapi/gss_wrap_size_limit.3
  projects/calloutng/lib/libgssapi/gssapi.3
  projects/calloutng/lib/libgssapi/mech.5
  projects/calloutng/lib/libkiconv/Makefile
  projects/calloutng/lib/libncp/ncpl_nls.c
  projects/calloutng/lib/libpmc/pmc.3
  projects/calloutng/lib/libprocstat/libprocstat.c
  projects/calloutng/lib/librpcsec_gss/rpc_gss_get_error.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_get_mech_info.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_get_principal_name.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_get_versions.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_getcred.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_is_installed.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_max_data_length.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_mech_to_oid.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_oid_to_mech.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_qop_to_num.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_seccreate.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_set_callback.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_set_defaults.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_set_svc_name.3
  projects/calloutng/lib/librpcsec_gss/rpc_gss_svc_max_data_length.3
  projects/calloutng/lib/libusb/Makefile
  projects/calloutng/lib/libusb/libusb10.c
  projects/calloutng/lib/libusb/libusb10_io.c
  projects/calloutng/lib/libusb/libusb20.3
  projects/calloutng/lib/libutil/Makefile
  projects/calloutng/lib/libutil/auth.c
  projects/calloutng/lib/libutil/login.conf.5
  projects/calloutng/lib/libutil/property.3
  projects/calloutng/libexec/rshd/rshd.8
  projects/calloutng/libexec/rtld-elf/map_object.c
  projects/calloutng/release/picobsd/tinyware/passwd/passwd.c
  projects/calloutng/sbin/camcontrol/camcontrol.8
  projects/calloutng/sbin/camcontrol/camcontrol.c
  projects/calloutng/sbin/devd/devd.cc
  projects/calloutng/sbin/devfs/devfs.8
  projects/calloutng/sbin/fsck_ffs/suj.c
  projects/calloutng/sbin/hastd/primary.c
  projects/calloutng/sbin/hastd/synch.h
  projects/calloutng/sbin/ifconfig/ifconfig.8
  projects/calloutng/sbin/ipfw/ipfw.8
  projects/calloutng/sbin/mca/Makefile
  projects/calloutng/sbin/mca/mca.c
  projects/calloutng/sbin/natd/natd.8
  projects/calloutng/sbin/setkey/setkey.8
  projects/calloutng/share/examples/csh/dot.cshrc
  projects/calloutng/share/examples/etc/README.examples
  projects/calloutng/share/examples/mdoc/example.4
  projects/calloutng/share/man/man4/Makefile
  projects/calloutng/share/man/man4/acpi_panasonic.4
  projects/calloutng/share/man/man4/ahci.4
  projects/calloutng/share/man/man4/ata.4
  projects/calloutng/share/man/man4/bce.4
  projects/calloutng/share/man/man4/firewire.4
  projects/calloutng/share/man/man4/hptrr.4
  projects/calloutng/share/man/man4/io.4
  projects/calloutng/share/man/man4/ip.4
  projects/calloutng/share/man/man4/mac_lomac.4
  projects/calloutng/share/man/man4/man4.i386/sbni.4
  projects/calloutng/share/man/man4/mps.4
  projects/calloutng/share/man/man4/mpt.4
  projects/calloutng/share/man/man4/mvs.4
  projects/calloutng/share/man/man4/ng_ksocket.4
  projects/calloutng/share/man/man4/run.4
  projects/calloutng/share/man/man4/scsi.4
  projects/calloutng/share/man/man4/siis.4
  projects/calloutng/share/man/man4/snd_hda.4
  projects/calloutng/share/man/man4/usb.4
  projects/calloutng/share/man/man4/vlan.4
  projects/calloutng/share/man/man4/witness.4
  projects/calloutng/share/man/man5/make.conf.5
  projects/calloutng/share/man/man5/periodic.conf.5
  projects/calloutng/share/man/man5/rc.conf.5
  projects/calloutng/share/man/man7/development.7
  projects/calloutng/share/man/man9/rmlock.9
  projects/calloutng/share/man/man9/rwlock.9
  projects/calloutng/share/misc/committers-ports.dot
  projects/calloutng/share/misc/committers-src.dot
  projects/calloutng/share/mk/bsd.lib.mk
  projects/calloutng/share/mk/bsd.own.mk
  projects/calloutng/share/mk/bsd.sys.mk
  projects/calloutng/sys/amd64/acpica/acpi_wakecode.S
  projects/calloutng/sys/amd64/amd64/cpu_switch.S
  projects/calloutng/sys/amd64/amd64/genassym.c
  projects/calloutng/sys/amd64/amd64/minidump_machdep.c
  projects/calloutng/sys/amd64/amd64/mp_machdep.c
  projects/calloutng/sys/amd64/amd64/pmap.c
  projects/calloutng/sys/amd64/amd64/trap.c
  projects/calloutng/sys/amd64/conf/GENERIC
  projects/calloutng/sys/amd64/include/atomic.h
  projects/calloutng/sys/amd64/include/pcb.h
  projects/calloutng/sys/amd64/include/pmap.h
  projects/calloutng/sys/amd64/include/smp.h
  projects/calloutng/sys/arm/arm/bcopyinout_xscale.S
  projects/calloutng/sys/arm/arm/bootconfig.c
  projects/calloutng/sys/arm/arm/busdma_machdep.c
  projects/calloutng/sys/arm/arm/cpufunc.c
  projects/calloutng/sys/arm/arm/cpufunc_asm.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_arm10.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_arm11.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_arm7tdmi.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_arm8.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_arm9.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_armv4.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_armv5.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_sa1.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_xscale.S
  projects/calloutng/sys/arm/arm/cpufunc_asm_xscale_c3.S
  projects/calloutng/sys/arm/arm/db_disasm.c
  projects/calloutng/sys/arm/arm/db_interface.c
  projects/calloutng/sys/arm/arm/db_trace.c
  projects/calloutng/sys/arm/arm/disassem.c
  projects/calloutng/sys/arm/arm/dump_machdep.c
  projects/calloutng/sys/arm/arm/elf_trampoline.c
  projects/calloutng/sys/arm/arm/exception.S
  projects/calloutng/sys/arm/arm/gdb_machdep.c
  projects/calloutng/sys/arm/arm/in_cksum.c
  projects/calloutng/sys/arm/arm/intr.c
  projects/calloutng/sys/arm/arm/irq_dispatch.S
  projects/calloutng/sys/arm/arm/locore.S
  projects/calloutng/sys/arm/arm/machdep.c
  projects/calloutng/sys/arm/arm/mem.c
  projects/calloutng/sys/arm/arm/nexus.c
  projects/calloutng/sys/arm/arm/pmap.c
  projects/calloutng/sys/arm/arm/support.S
  projects/calloutng/sys/arm/arm/swtch.S
  projects/calloutng/sys/arm/arm/sys_machdep.c
  projects/calloutng/sys/arm/arm/trap.c
  projects/calloutng/sys/arm/arm/undefined.c
  projects/calloutng/sys/arm/arm/vectors.S
  projects/calloutng/sys/arm/arm/vm_machdep.c
  projects/calloutng/sys/arm/at91/at91.c
  projects/calloutng/sys/arm/at91/at91_machdep.c
  projects/calloutng/sys/arm/at91/at91_mci.c
  projects/calloutng/sys/arm/at91/at91_pio.c
  projects/calloutng/sys/arm/at91/at91_pio_rm9200.h
  projects/calloutng/sys/arm/at91/at91_pit.c
  projects/calloutng/sys/arm/at91/at91_pitreg.h
  projects/calloutng/sys/arm/at91/at91_pmc.c
  projects/calloutng/sys/arm/at91/at91_pmcvar.h
  projects/calloutng/sys/arm/at91/at91_reset.S
  projects/calloutng/sys/arm/at91/at91_rst.c
  projects/calloutng/sys/arm/at91/at91_spi.c
  projects/calloutng/sys/arm/at91/at91_spireg.h
  projects/calloutng/sys/arm/at91/at91_ssc.c
  projects/calloutng/sys/arm/at91/at91_st.c
  projects/calloutng/sys/arm/at91/at91_wdtreg.h
  projects/calloutng/sys/arm/at91/at91reg.h
  projects/calloutng/sys/arm/at91/at91rm9200.c
  projects/calloutng/sys/arm/at91/at91rm92reg.h
  projects/calloutng/sys/arm/at91/at91sam9260.c
  projects/calloutng/sys/arm/at91/at91sam9260reg.h
  projects/calloutng/sys/arm/at91/at91sam9g20.c
  projects/calloutng/sys/arm/at91/at91sam9g20reg.h
  projects/calloutng/sys/arm/at91/at91var.h
  projects/calloutng/sys/arm/at91/board_qila9g20.c
  projects/calloutng/sys/arm/at91/board_sam9g20ek.c
  projects/calloutng/sys/arm/at91/files.at91
  projects/calloutng/sys/arm/at91/if_macb.c
  projects/calloutng/sys/arm/at91/std.at91
  projects/calloutng/sys/arm/at91/std.at91sam9
  projects/calloutng/sys/arm/at91/uart_cpu_at91rm9200usart.c
  projects/calloutng/sys/arm/conf/AVILA
  projects/calloutng/sys/arm/conf/BWCT
  projects/calloutng/sys/arm/conf/CAMBRIA
  projects/calloutng/sys/arm/conf/CNS11XXNAS
  projects/calloutng/sys/arm/conf/CRB
  projects/calloutng/sys/arm/conf/EP80219
  projects/calloutng/sys/arm/conf/ETHERNUT5
  projects/calloutng/sys/arm/conf/GUMSTIX
  projects/calloutng/sys/arm/conf/GUMSTIX-QEMU
  projects/calloutng/sys/arm/conf/HL200
  projects/calloutng/sys/arm/conf/HL201
  projects/calloutng/sys/arm/conf/IQ31244
  projects/calloutng/sys/arm/conf/KB920X
  projects/calloutng/sys/arm/conf/LN2410SBC
  projects/calloutng/sys/arm/conf/NSLU
  projects/calloutng/sys/arm/conf/QILA9G20
  projects/calloutng/sys/arm/conf/QILA9G20.hints
  projects/calloutng/sys/arm/conf/SAM9G20EK
  projects/calloutng/sys/arm/conf/SAM9G20EK.hints
  projects/calloutng/sys/arm/conf/SIMICS
  projects/calloutng/sys/arm/econa/econa_machdep.c
  projects/calloutng/sys/arm/include/armreg.h
  projects/calloutng/sys/arm/include/asmacros.h
  projects/calloutng/sys/arm/include/atomic.h
  projects/calloutng/sys/arm/include/blockio.h
  projects/calloutng/sys/arm/include/cpu.h
  projects/calloutng/sys/arm/include/cpufunc.h
  projects/calloutng/sys/arm/include/elf.h
  projects/calloutng/sys/arm/include/endian.h
  projects/calloutng/sys/arm/include/fdt.h
  projects/calloutng/sys/arm/include/fp.h
  projects/calloutng/sys/arm/include/frame.h
  projects/calloutng/sys/arm/include/ieee.h
  projects/calloutng/sys/arm/include/in_cksum.h
  projects/calloutng/sys/arm/include/intr.h
  projects/calloutng/sys/arm/include/katelib.h
  projects/calloutng/sys/arm/include/machdep.h
  projects/calloutng/sys/arm/include/param.h
  projects/calloutng/sys/arm/include/pmap.h
  projects/calloutng/sys/arm/include/pmc_mdep.h
  projects/calloutng/sys/arm/include/profile.h
  projects/calloutng/sys/arm/include/pte.h
  projects/calloutng/sys/arm/include/resource.h
  projects/calloutng/sys/arm/include/stack.h
  projects/calloutng/sys/arm/include/vmparam.h
  projects/calloutng/sys/arm/mv/mv_machdep.c
  projects/calloutng/sys/arm/mv/mvwin.h
  projects/calloutng/sys/arm/mv/std.mv
  projects/calloutng/sys/arm/s3c2xx0/s3c2410reg.h
  projects/calloutng/sys/arm/s3c2xx0/s3c2440reg.h
  projects/calloutng/sys/arm/s3c2xx0/s3c24x0.c
  projects/calloutng/sys/arm/s3c2xx0/s3c24x0_machdep.c
  projects/calloutng/sys/arm/s3c2xx0/s3c24x0reg.h
  projects/calloutng/sys/arm/sa11x0/assabet_machdep.c
  projects/calloutng/sys/arm/sa11x0/sa11x0.c
  projects/calloutng/sys/arm/sa11x0/sa11x0_gpioreg.h
  projects/calloutng/sys/arm/sa11x0/sa11x0_io_asm.S
  projects/calloutng/sys/arm/sa11x0/sa11x0_irq.S
  projects/calloutng/sys/arm/sa11x0/sa11x0_ost.c
  projects/calloutng/sys/arm/sa11x0/sa11x0_ostreg.h
  projects/calloutng/sys/arm/sa11x0/sa11x0_var.h
  projects/calloutng/sys/arm/sa11x0/uart_dev_sa1110.c
  projects/calloutng/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/calloutng/sys/arm/xscale/i80321/i80321.c
  projects/calloutng/sys/arm/xscale/i80321/i80321_aau.c
  projects/calloutng/sys/arm/xscale/i80321/i80321_dma.c
  projects/calloutng/sys/arm/xscale/i80321/i80321_intr.h
  projects/calloutng/sys/arm/xscale/i80321/i80321_pci.c
  projects/calloutng/sys/arm/xscale/i80321/i80321_space.c
  projects/calloutng/sys/arm/xscale/i80321/i80321_timer.c
  projects/calloutng/sys/arm/xscale/i80321/i80321reg.h
  projects/calloutng/sys/arm/xscale/i80321/iq31244_7seg.c
  projects/calloutng/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/calloutng/sys/arm/xscale/i80321/iq80321.c
  projects/calloutng/sys/arm/xscale/i80321/obio.c
  projects/calloutng/sys/arm/xscale/i8134x/crb_machdep.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342_mcu.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342_pci.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342_space.c
  projects/calloutng/sys/arm/xscale/i8134x/i81342reg.h
  projects/calloutng/sys/arm/xscale/i8134x/iq81342_7seg.c
  projects/calloutng/sys/arm/xscale/i8134x/obio.c
  projects/calloutng/sys/arm/xscale/i8134x/uart_cpu_i81342.c
  projects/calloutng/sys/arm/xscale/ixp425/avila_ata.c
  projects/calloutng/sys/arm/xscale/ixp425/avila_gpio.c
  projects/calloutng/sys/arm/xscale/ixp425/avila_machdep.c
  projects/calloutng/sys/arm/xscale/ixp425/cambria_exp_space.c
  projects/calloutng/sys/arm/xscale/ixp425/if_npe.c
  projects/calloutng/sys/arm/xscale/ixp425/if_npereg.h
  projects/calloutng/sys/arm/xscale/ixp425/ixp425.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_iic.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_npe.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_npereg.h
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_pci.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_pci_space.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_qmgr.c
  projects/calloutng/sys/arm/xscale/ixp425/ixp425_qmgr.h
  projects/calloutng/sys/arm/xscale/ixp425/ixp425reg.h
  projects/calloutng/sys/arm/xscale/pxa/if_smc_smi.c
  projects/calloutng/sys/arm/xscale/pxa/pxa_machdep.c
  projects/calloutng/sys/arm/xscale/pxa/pxareg.h
  projects/calloutng/sys/boot/i386/boot2/boot2.c
  projects/calloutng/sys/boot/ofw/libofw/ofw_disk.c
  projects/calloutng/sys/boot/sparc64/loader/main.c
  projects/calloutng/sys/boot/zfs/zfsimpl.c
  projects/calloutng/sys/cam/ata/ata_da.c
  projects/calloutng/sys/cam/ata/ata_pmp.c
  projects/calloutng/sys/cam/ata/ata_xpt.c
  projects/calloutng/sys/cam/cam.h
  projects/calloutng/sys/cam/cam_ccb.h
  projects/calloutng/sys/cam/cam_debug.h
  projects/calloutng/sys/cam/cam_periph.c
  projects/calloutng/sys/cam/cam_periph.h
  projects/calloutng/sys/cam/cam_xpt.c
  projects/calloutng/sys/cam/cam_xpt.h
  projects/calloutng/sys/cam/ctl/scsi_ctl.c
  projects/calloutng/sys/cam/scsi/scsi_all.c
  projects/calloutng/sys/cam/scsi/scsi_all.h
  projects/calloutng/sys/cam/scsi/scsi_cd.c
  projects/calloutng/sys/cam/scsi/scsi_da.c
  projects/calloutng/sys/cam/scsi/scsi_pass.c
  projects/calloutng/sys/cam/scsi/scsi_pt.c
  projects/calloutng/sys/cam/scsi/scsi_sa.c
  projects/calloutng/sys/cam/scsi/scsi_target.c
  projects/calloutng/sys/cam/scsi/scsi_xpt.c
  projects/calloutng/sys/cddl/boot/zfs/zfsimpl.h
  projects/calloutng/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/calloutng/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
  projects/calloutng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  projects/calloutng/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  projects/calloutng/sys/conf/NOTES
  projects/calloutng/sys/conf/files
  projects/calloutng/sys/conf/files.amd64
  projects/calloutng/sys/conf/files.i386
  projects/calloutng/sys/conf/files.powerpc
  projects/calloutng/sys/conf/kern.post.mk
  projects/calloutng/sys/conf/options
  projects/calloutng/sys/conf/options.arm
  projects/calloutng/sys/contrib/pf/net/pf.c
  projects/calloutng/sys/contrib/pf/net/pf_ioctl.c
  projects/calloutng/sys/contrib/pf/net/pf_table.c
  projects/calloutng/sys/contrib/pf/net/pfvar.h
  projects/calloutng/sys/dev/acpica/Osd/OsdSynch.c
  projects/calloutng/sys/dev/acpica/acpi.c
  projects/calloutng/sys/dev/acpica/acpi_ec.c
  projects/calloutng/sys/dev/acpica/acpi_video.c
  projects/calloutng/sys/dev/acpica/acpivar.h
  projects/calloutng/sys/dev/ae/if_ae.c
  projects/calloutng/sys/dev/ahci/ahci.c
  projects/calloutng/sys/dev/aic7xxx/aicasm/Makefile
  projects/calloutng/sys/dev/aic7xxx/aicasm/aicasm.c
  projects/calloutng/sys/dev/ata/ata-all.c
  projects/calloutng/sys/dev/ata/chipsets/ata-ite.c
  projects/calloutng/sys/dev/ath/ath_hal/ah_desc.h
  projects/calloutng/sys/dev/ath/ath_hal/ah_internal.h
  projects/calloutng/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c
  projects/calloutng/sys/dev/ath/ath_hal/ar9002/ar9287_reset.c
  projects/calloutng/sys/dev/ath/if_ath.c
  projects/calloutng/sys/dev/ath/if_ath_debug.c
  projects/calloutng/sys/dev/ath/if_ath_misc.h
  projects/calloutng/sys/dev/ath/if_ath_rx.c
  projects/calloutng/sys/dev/ath/if_ath_sysctl.c
  projects/calloutng/sys/dev/ath/if_ath_tx.c
  projects/calloutng/sys/dev/ath/if_ath_tx.h
  projects/calloutng/sys/dev/ath/if_ath_tx_ht.c
  projects/calloutng/sys/dev/ath/if_athioctl.h
  projects/calloutng/sys/dev/ath/if_athvar.h
  projects/calloutng/sys/dev/bge/if_bge.c
  projects/calloutng/sys/dev/bge/if_bgereg.h
  projects/calloutng/sys/dev/drm2/i915/i915_gem.c
  projects/calloutng/sys/dev/e1000/if_igb.c
  projects/calloutng/sys/dev/flash/at45d.c
  projects/calloutng/sys/dev/hptiop/hptiop.c
  projects/calloutng/sys/dev/hptmv/entry.c
  projects/calloutng/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/calloutng/sys/dev/hwpmc/hwpmc_arm.c
  projects/calloutng/sys/dev/hwpmc/hwpmc_intel.c
  projects/calloutng/sys/dev/isp/isp.c
  projects/calloutng/sys/dev/isp/isp_freebsd.c
  projects/calloutng/sys/dev/isp/isp_freebsd.h
  projects/calloutng/sys/dev/isp/isp_pci.c
  projects/calloutng/sys/dev/isp/isp_sbus.c
  projects/calloutng/sys/dev/isp/ispvar.h
  projects/calloutng/sys/dev/iwn/if_iwn.c
  projects/calloutng/sys/dev/ixgbe/ixgbe.c
  projects/calloutng/sys/dev/jme/if_jme.c
  projects/calloutng/sys/dev/mfi/mfi_disk.c
  projects/calloutng/sys/dev/mmc/mmc.c
  projects/calloutng/sys/dev/mmc/mmcsd.c
  projects/calloutng/sys/dev/mvs/mvs.c
  projects/calloutng/sys/dev/mvs/mvs.h
  projects/calloutng/sys/dev/mvs/mvs_soc.c
  projects/calloutng/sys/dev/pci/pci_pci.c
  projects/calloutng/sys/dev/puc/pucdata.c
  projects/calloutng/sys/dev/siis/siis.c
  projects/calloutng/sys/dev/sym/sym_conf.h
  projects/calloutng/sys/dev/sym/sym_hipd.c
  projects/calloutng/sys/dev/usb/quirk/usb_quirk.c
  projects/calloutng/sys/dev/usb/serial/uftdi.c
  projects/calloutng/sys/dev/usb/serial/uftdi_reg.h
  projects/calloutng/sys/dev/usb/usb_device.c
  projects/calloutng/sys/dev/usb/usb_generic.c
  projects/calloutng/sys/dev/usb/usbdevs
  projects/calloutng/sys/dev/usb/wlan/if_rum.c
  projects/calloutng/sys/dev/usb/wlan/if_run.c
  projects/calloutng/sys/dev/usb/wlan/if_ural.c
  projects/calloutng/sys/dev/vxge/vxgehal/vxgehal-channel.h
  projects/calloutng/sys/dev/wpi/if_wpi.c
  projects/calloutng/sys/fs/nfsclient/nfs_clbio.c
  projects/calloutng/sys/fs/nfsclient/nfs_clnode.c
  projects/calloutng/sys/geom/multipath/g_multipath.c
  projects/calloutng/sys/geom/part/g_part_gpt.c
  projects/calloutng/sys/i386/acpica/acpi_wakecode.S
  projects/calloutng/sys/i386/conf/GENERIC
  projects/calloutng/sys/i386/i386/minidump_machdep.c
  projects/calloutng/sys/i386/i386/mp_machdep.c
  projects/calloutng/sys/i386/i386/pmap.c
  projects/calloutng/sys/i386/i386/swtch.s
  projects/calloutng/sys/i386/include/atomic.h
  projects/calloutng/sys/i386/include/pcb.h
  projects/calloutng/sys/i386/include/pmap.h
  projects/calloutng/sys/i386/include/smp.h
  projects/calloutng/sys/i386/xen/pmap.c
  projects/calloutng/sys/ia64/acpica/acpi_wakeup.c
  projects/calloutng/sys/ia64/ia64/pmap.c
  projects/calloutng/sys/ia64/include/pmap.h
  projects/calloutng/sys/kern/capabilities.conf
  projects/calloutng/sys/kern/init_main.c
  projects/calloutng/sys/kern/init_sysent.c
  projects/calloutng/sys/kern/kern_descrip.c
  projects/calloutng/sys/kern/kern_event.c
  projects/calloutng/sys/kern/kern_shutdown.c
  projects/calloutng/sys/kern/kern_thread.c
  projects/calloutng/sys/kern/subr_rman.c
  projects/calloutng/sys/kern/subr_smp.c
  projects/calloutng/sys/kern/subr_trap.c
  projects/calloutng/sys/kern/sys_capability.c
  projects/calloutng/sys/kern/tty.c
  projects/calloutng/sys/kern/uipc_syscalls.c
  projects/calloutng/sys/kern/uipc_usrreq.c
  projects/calloutng/sys/kern/vfs_bio.c
  projects/calloutng/sys/kern/vfs_default.c
  projects/calloutng/sys/kern/vfs_subr.c
  projects/calloutng/sys/kern/vfs_syscalls.c
  projects/calloutng/sys/kern/vfs_vnops.c
  projects/calloutng/sys/libkern/iconv.c
  projects/calloutng/sys/mips/include/pmap.h
  projects/calloutng/sys/mips/rmi/rootfs_list.txt
  projects/calloutng/sys/modules/Makefile
  projects/calloutng/sys/modules/wpi/Makefile
  projects/calloutng/sys/modules/zfs/Makefile
  projects/calloutng/sys/net/bpf.c
  projects/calloutng/sys/net/if.h
  projects/calloutng/sys/net/if_bridge.c
  projects/calloutng/sys/net/if_gif.c
  projects/calloutng/sys/net/if_loop.c
  projects/calloutng/sys/net/if_tap.c
  projects/calloutng/sys/netgraph/netflow/netflow_v9.c
  projects/calloutng/sys/netgraph/netflow/ng_netflow.c
  projects/calloutng/sys/netinet/in.h
  projects/calloutng/sys/netinet/in_pcb.c
  projects/calloutng/sys/netinet/in_pcb.h
  projects/calloutng/sys/netinet/ip_input.c
  projects/calloutng/sys/netinet/ip_output.c
  projects/calloutng/sys/netinet/ipfw/ip_fw_table.c
  projects/calloutng/sys/netinet/libalias/libalias.3
  projects/calloutng/sys/netinet/sctp_asconf.c
  projects/calloutng/sys/netinet/sctp_indata.c
  projects/calloutng/sys/netinet/sctp_indata.h
  projects/calloutng/sys/netinet/sctp_input.c
  projects/calloutng/sys/netinet/sctp_input.h
  projects/calloutng/sys/netinet/sctp_output.c
  projects/calloutng/sys/netinet/sctp_output.h
  projects/calloutng/sys/netinet/sctp_pcb.c
  projects/calloutng/sys/netinet/sctputil.c
  projects/calloutng/sys/netinet/sctputil.h
  projects/calloutng/sys/netinet/tcp_input.c
  projects/calloutng/sys/netinet/tcp_lro.c
  projects/calloutng/sys/netinet/udp_usrreq.c
  projects/calloutng/sys/netinet6/in6.c
  projects/calloutng/sys/netinet6/ip6_forward.c
  projects/calloutng/sys/netinet6/ip6_input.c
  projects/calloutng/sys/netinet6/ip6_output.c
  projects/calloutng/sys/netinet6/sctp6_usrreq.c
  projects/calloutng/sys/netncp/ncp_nls.h
  projects/calloutng/sys/netsmb/smb_dev.c
  projects/calloutng/sys/powerpc/booke/machdep.c
  projects/calloutng/sys/powerpc/booke/platform_bare.c
  projects/calloutng/sys/powerpc/include/pmap.h
  projects/calloutng/sys/sparc64/include/pmap.h
  projects/calloutng/sys/sys/buf.h
  projects/calloutng/sys/sys/cdefs.h
  projects/calloutng/sys/sys/filedesc.h
  projects/calloutng/sys/sys/kernel.h
  projects/calloutng/sys/sys/mbuf.h
  projects/calloutng/sys/sys/mount.h
  projects/calloutng/sys/sys/param.h
  projects/calloutng/sys/sys/proc.h
  projects/calloutng/sys/sys/smp.h
  projects/calloutng/sys/sys/vnode.h
  projects/calloutng/sys/ufs/ffs/ffs_softdep.c
  projects/calloutng/sys/ufs/ffs/ffs_vfsops.c
  projects/calloutng/sys/ufs/ffs/ffs_vnops.c
  projects/calloutng/sys/vm/pmap.h
  projects/calloutng/sys/vm/swap_pager.c
  projects/calloutng/sys/vm/vm_map.c
  projects/calloutng/sys/vm/vm_page.c
  projects/calloutng/sys/vm/vm_page.h
  projects/calloutng/sys/vm/vm_pageout.c
  projects/calloutng/sys/vm/vnode_pager.c
  projects/calloutng/sys/x86/x86/dump_machdep.c
  projects/calloutng/tools/regression/bin/sh/builtins/wait3.0
  projects/calloutng/tools/tools/ath/Makefile
  projects/calloutng/tools/tools/ath/athdebug/athdebug.c
  projects/calloutng/tools/tools/net80211/wlanstats/main.c
  projects/calloutng/tools/tools/syscall_timing/syscall_timing.c
  projects/calloutng/tools/tools/tinybsd/README
  projects/calloutng/usr.bin/calendar/calendars/calendar.freebsd
  projects/calloutng/usr.bin/cut/cut.1
  projects/calloutng/usr.bin/cut/cut.c
  projects/calloutng/usr.bin/find/find.1
  projects/calloutng/usr.bin/gzip/zmore.1
  projects/calloutng/usr.bin/kdump/kdump.1
  projects/calloutng/usr.bin/kdump/kdump.c
  projects/calloutng/usr.bin/ktrace/ktrace.1
  projects/calloutng/usr.bin/ktrace/ktrace.h
  projects/calloutng/usr.bin/login/login.1
  projects/calloutng/usr.bin/make/Makefile
  projects/calloutng/usr.bin/make/make.1
  projects/calloutng/usr.bin/make/var.c
  projects/calloutng/usr.bin/man/man.conf.5
  projects/calloutng/usr.bin/passwd/passwd.1
  projects/calloutng/usr.bin/rlogin/rlogin.1
  projects/calloutng/usr.bin/rsh/rsh.1
  projects/calloutng/usr.bin/sort/coll.c
  projects/calloutng/usr.bin/sort/sort.h
  projects/calloutng/usr.bin/touch/touch.1
  projects/calloutng/usr.bin/touch/touch.c
  projects/calloutng/usr.bin/usbhidctl/usbhidctl.1
  projects/calloutng/usr.sbin/adduser/rmuser.8
  projects/calloutng/usr.sbin/apmd/apmd.8
  projects/calloutng/usr.sbin/arp/arp.4
  projects/calloutng/usr.sbin/bluetooth/bthidcontrol/bthidcontrol.8
  projects/calloutng/usr.sbin/bluetooth/btpand/btpand.8
  projects/calloutng/usr.sbin/bluetooth/hccontrol/hccontrol.8
  projects/calloutng/usr.sbin/bluetooth/l2control/l2control.8
  projects/calloutng/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8
  projects/calloutng/usr.sbin/cpucontrol/amd.c
  projects/calloutng/usr.sbin/ctladm/ctladm.8
  projects/calloutng/usr.sbin/daemon/daemon.8
  projects/calloutng/usr.sbin/daemon/daemon.c
  projects/calloutng/usr.sbin/digictl/digictl.8
  projects/calloutng/usr.sbin/flowctl/flowctl.8
  projects/calloutng/usr.sbin/flowctl/flowctl.c
  projects/calloutng/usr.sbin/fwcontrol/fwcontrol.8
  projects/calloutng/usr.sbin/gssd/gssd.8
  projects/calloutng/usr.sbin/inetd/inetd.c
  projects/calloutng/usr.sbin/inetd/inetd.h
  projects/calloutng/usr.sbin/jail/jail.8
  projects/calloutng/usr.sbin/jail/jail.conf.5
  projects/calloutng/usr.sbin/ndiscvt/ndiscvt.8
  projects/calloutng/usr.sbin/newsyslog/newsyslog.8
  projects/calloutng/usr.sbin/newsyslog/newsyslog.conf.5
  projects/calloutng/usr.sbin/pc-sysinstall/backend/functions-localize.sh
  projects/calloutng/usr.sbin/pc-sysinstall/backend/functions.sh
  projects/calloutng/usr.sbin/pciconf/Makefile
  projects/calloutng/usr.sbin/pciconf/cap.c
  projects/calloutng/usr.sbin/pciconf/pciconf.8
  projects/calloutng/usr.sbin/pciconf/pciconf.c
  projects/calloutng/usr.sbin/pciconf/pciconf.h
  projects/calloutng/usr.sbin/pkg_install/add/main.c
  projects/calloutng/usr.sbin/pkg_install/add/perform.c
  projects/calloutng/usr.sbin/pkg_install/add/pkg_add.1
  projects/calloutng/usr.sbin/pkg_install/lib/file.c
  projects/calloutng/usr.sbin/pkg_install/lib/lib.h
  projects/calloutng/usr.sbin/pkg_install/lib/url.c
  projects/calloutng/usr.sbin/pmcstat/pmcstat.8
  projects/calloutng/usr.sbin/pmcstat/pmcstat_log.c
  projects/calloutng/usr.sbin/setfib/setfib.1
  projects/calloutng/usr.sbin/syslogd/syslogd.8
Directory Properties:
  projects/calloutng/   (props changed)
  projects/calloutng/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/contrib/bind9/   (props changed)
  projects/calloutng/contrib/gcc/   (props changed)
  projects/calloutng/contrib/libc++/   (props changed)
  projects/calloutng/contrib/libstdc++/   (props changed)
  projects/calloutng/contrib/llvm/   (props changed)
  projects/calloutng/gnu/lib/   (props changed)
  projects/calloutng/lib/libc/   (props changed)
  projects/calloutng/lib/libutil/   (props changed)
  projects/calloutng/sbin/   (props changed)
  projects/calloutng/sbin/ipfw/   (props changed)
  projects/calloutng/share/man/man4/   (props changed)
  projects/calloutng/sys/   (props changed)
  projects/calloutng/sys/boot/   (props changed)
  projects/calloutng/sys/cddl/contrib/opensolaris/   (props changed)
  projects/calloutng/sys/conf/   (props changed)
  projects/calloutng/sys/contrib/pf/   (props changed)
  projects/calloutng/tools/regression/usr.bin/make/all.sh   (props changed)
  projects/calloutng/usr.bin/calendar/   (props changed)
  projects/calloutng/usr.sbin/jail/   (props changed)
  projects/calloutng/usr.sbin/ndiscvt/   (props changed)

Modified: projects/calloutng/Makefile.inc1
==============================================================================
--- projects/calloutng/Makefile.inc1	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/Makefile.inc1	Sun Jun 17 21:48:40 2012	(r237213)
@@ -15,6 +15,7 @@
 #	-DNO_WWWUPDATE do not update www in ${MAKE} update
 #	-DNO_CTF do not run the DTrace CTF conversion tools on built objects
 #	LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+#	LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target
 #	LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools
 #	    list
 #	TARGET="machine" to crossbuild world for a different machine type
@@ -88,7 +89,7 @@ SUBDIR+=etc
 
 # These are last, since it is nice to at least get the base system
 # rebuilt before you do them.
-.for _DIR in ${LOCAL_DIRS}
+.for _DIR in ${LOCAL_LIB_DIRS} ${LOCAL_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
 SUBDIR+= ${_DIR}
 .endif
@@ -242,7 +243,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
 		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
 
 # build-tools stage
 TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
@@ -252,7 +253,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DNO_LINT \
-		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
 
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
@@ -487,7 +488,8 @@ build32:
 .for _dir in lib/ncurses/ncurses lib/ncurses/ncursesw lib/libmagic
 	cd ${.CURDIR}/${_dir}; \
 	    MAKEOBJDIRPREFIX=${OBJTREE}/lib32 ${MAKE} SSP_CFLAGS= DESTDIR= \
-	    DIRPRFX=${_dir}/ build-tools
+	    DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF \
+	    -DEARLY_BUILD build-tools
 .endfor
 	cd ${.CURDIR}; \
 	    ${LIB32WMAKE} -f Makefile.inc1 libraries
@@ -829,7 +831,7 @@ buildkernel:
 	cd ${KRNLOBJDIR}/${_kernel}; \
 	    PATH=${BPATH}:${PATH} \
 	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF \
+	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
 	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
 # XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
 .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
@@ -837,7 +839,7 @@ buildkernel:
 	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
 	    PATH=${BPATH}:${PATH} \
 	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF ${target}
+	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
 .endfor
 .endif
 .if !defined(NO_KERNELDEPEND)
@@ -1272,6 +1274,11 @@ _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
+.for _DIR in ${LOCAL_LIB_DIRS}
+.if exists(${.CURDIR}/${_DIR}/Makefile)
+_generic_libs+= ${_DIR}
+.endif
+.endfor
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L
 

Modified: projects/calloutng/ObsoleteFiles.inc
==============================================================================
--- projects/calloutng/ObsoleteFiles.inc	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/ObsoleteFiles.inc	Sun Jun 17 21:48:40 2012	(r237213)
@@ -38,8 +38,13 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20120613: auth.conf removed
+OLD_FILES+=etc/auth.conf
+OLD_FILES+=usr/share/examples/etc/auth.conf
+OLD_FILES+=usr/share/man/man3/auth.3.gz
+OLD_FILES+=usr/share/man/man5/auth.conf.5.gz
 # 20120530: kde pam lives now in ports
-OLD_FILES+=/etc/pam.d/kde
+OLD_FILES+=etc/pam.d/kde
 # 20120505: new clang import installed a redundant internal header
 OLD_FILES+=usr/include/clang/3.1/stdalign.h
 # 20120428: MD2 removed from libmd

Modified: projects/calloutng/UPDATING
==============================================================================
--- projects/calloutng/UPDATING	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/UPDATING	Sun Jun 17 21:48:40 2012	(r237213)
@@ -24,6 +24,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20120611:
+	A new version of ZFS (pool version 5000) has been merged to -HEAD.
+	Starting with this version the old system of ZFS pool versioning
+	is superseded by "feature flags". This concept enables forward
+	compatibility against certain future changes in functionality of ZFS
+	pools. The first read-only compatible "feature flag" for ZFS pools
+	is named "com.delphix:async_destroy". For more information
+	read the new zpool-features(5) manual page.
+	Please refer to the "ZFS notes" section of this file for information
+	on upgrading boot ZFS pools.
+
 20120417:
 	The malloc(3) implementation embedded in libc now uses sources imported
 	as contrib/jemalloc.  The most disruptive API change is to

Modified: projects/calloutng/bin/rcp/rcp.1
==============================================================================
--- projects/calloutng/bin/rcp/rcp.1	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/bin/rcp/rcp.1	Sun Jun 17 21:48:40 2012	(r237213)
@@ -116,17 +116,11 @@ The
 .Nm
 utility handles third party copies, where neither source nor target files
 are on the current machine.
-.Sh FILES
-.Bl -tag -width ".Pa /etc/auth.conf" -compact
-.It Pa /etc/auth.conf
-configure authentication services
-.El
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr ftp 1 ,
 .Xr rlogin 1 ,
 .Xr rsh 1 ,
-.Xr auth.conf 5 ,
 .Xr hosts.equiv 5
 .Sh HISTORY
 The

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Sun Jun 17 21:48:40 2012	(r237213)
@@ -18,8 +18,10 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -54,6 +56,7 @@
 #include <sys/zfs_fuid.h>
 #include <sys/arc.h>
 #include <sys/ddt.h>
+#include <sys/zfeature.h>
 #undef ZFS_MAXNAMELEN
 #undef verify
 #include <libzfs.h>
@@ -63,7 +66,8 @@
 #define	ZDB_CHECKSUM_NAME(idx) ((idx) < ZIO_CHECKSUM_FUNCTIONS ? \
     zio_checksum_table[(idx)].ci_name : "UNKNOWN")
 #define	ZDB_OT_NAME(idx) ((idx) < DMU_OT_NUMTYPES ? \
-    dmu_ot[(idx)].ot_name : "UNKNOWN")
+    dmu_ot[(idx)].ot_name : DMU_OT_IS_VALID(idx) ? \
+    dmu_ot_byteswap[DMU_OT_BYTESWAP(idx)].ob_name : "UNKNOWN")
 #define	ZDB_OT_TYPE(idx) ((idx) < DMU_OT_NUMTYPES ? (idx) : DMU_OT_NUMTYPES)
 
 #ifndef lint
@@ -1088,7 +1092,7 @@ dump_dsl_dataset(objset_t *os, uint64_t 
 
 	ASSERT(size == sizeof (*ds));
 	crtime = ds->ds_creation_time;
-	zdb_nicenum(ds->ds_used_bytes, used);
+	zdb_nicenum(ds->ds_referenced_bytes, used);
 	zdb_nicenum(ds->ds_compressed_bytes, compressed);
 	zdb_nicenum(ds->ds_uncompressed_bytes, uncompressed);
 	zdb_nicenum(ds->ds_unique_bytes, unique);
@@ -1132,6 +1136,44 @@ dump_dsl_dataset(objset_t *os, uint64_t 
 
 /* ARGSUSED */
 static int
+dump_bptree_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
+{
+	char blkbuf[BP_SPRINTF_LEN];
+
+	if (bp->blk_birth != 0) {
+		sprintf_blkptr(blkbuf, bp);
+		(void) printf("\t%s\n", blkbuf);
+	}
+	return (0);
+}
+
+static void
+dump_bptree(objset_t *os, uint64_t obj, char *name)
+{
+	char bytes[32];
+	bptree_phys_t *bt;
+	dmu_buf_t *db;
+
+	if (dump_opt['d'] < 3)
+		return;
+
+	VERIFY3U(0, ==, dmu_bonus_hold(os, obj, FTAG, &db));
+	bt = db->db_data;
+	zdb_nicenum(bt->bt_bytes, bytes);
+	(void) printf("\n    %s: %llu datasets, %s\n",
+	    name, (unsigned long long)(bt->bt_end - bt->bt_begin), bytes);
+	dmu_buf_rele(db, FTAG);
+
+	if (dump_opt['d'] < 5)
+		return;
+
+	(void) printf("\n");
+
+	(void) bptree_iterate(os, obj, B_FALSE, dump_bptree_cb, NULL, NULL);
+}
+
+/* ARGSUSED */
+static int
 dump_bpobj_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 {
 	char blkbuf[BP_SPRINTF_LEN];
@@ -1883,11 +1925,13 @@ typedef struct zdb_blkstats {
  */
 #define	ZDB_OT_DEFERRED	(DMU_OT_NUMTYPES + 0)
 #define	ZDB_OT_DITTO	(DMU_OT_NUMTYPES + 1)
-#define	ZDB_OT_TOTAL	(DMU_OT_NUMTYPES + 2)
+#define	ZDB_OT_OTHER	(DMU_OT_NUMTYPES + 2)
+#define	ZDB_OT_TOTAL	(DMU_OT_NUMTYPES + 3)
 
 static char *zdb_ot_extname[] = {
 	"deferred free",
 	"dedup ditto",
+	"other",
 	"Total",
 };
 
@@ -1968,9 +2012,10 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 
 	type = BP_GET_TYPE(bp);
 
-	zdb_count_block(zcb, zilog, bp, type);
+	zdb_count_block(zcb, zilog, bp,
+	    (type & DMU_OT_NEWTYPE) ? ZDB_OT_OTHER : type);
 
-	is_metadata = (BP_GET_LEVEL(bp) != 0 || dmu_ot[type].ot_metadata);
+	is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type));
 
 	if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) {
 		int ioerr;
@@ -2197,6 +2242,12 @@ dump_block_stats(spa_t *spa)
 		(void) bpobj_iterate_nofree(&spa->spa_dsl_pool->dp_free_bpobj,
 		    count_block_cb, &zcb, NULL);
 	}
+	if (spa_feature_is_active(spa,
+	    &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) {
+		VERIFY3U(0, ==, bptree_iterate(spa->spa_meta_objset,
+		    spa->spa_dsl_pool->dp_bptree_obj, B_FALSE, count_block_cb,
+		    &zcb, NULL));
+	}
 
 	if (dump_opt['c'] > 1)
 		flags |= TRAVERSE_PREFETCH_DATA;
@@ -2373,7 +2424,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo
 	}
 
 	if (BP_IS_HOLE(bp) || BP_GET_CHECKSUM(bp) == ZIO_CHECKSUM_OFF ||
-	    BP_GET_LEVEL(bp) > 0 || dmu_ot[BP_GET_TYPE(bp)].ot_metadata)
+	    BP_GET_LEVEL(bp) > 0 || DMU_OT_IS_METADATA(BP_GET_TYPE(bp)))
 		return (0);
 
 	ddt_key_fill(&zdde_search.zdde_key, bp);
@@ -2478,7 +2529,14 @@ dump_zpool(spa_t *spa)
 			dump_bpobj(&spa->spa_deferred_bpobj, "Deferred frees");
 			if (spa_version(spa) >= SPA_VERSION_DEADLISTS) {
 				dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj,
-				    "Pool frees");
+				    "Pool snapshot frees");
+			}
+
+			if (spa_feature_is_active(spa,
+			    &spa_feature_table[SPA_FEATURE_ASYNC_DESTROY])) {
+				dump_bptree(spa->spa_meta_objset,
+				    spa->spa_dsl_pool->dp_bptree_obj,
+				    "Pool dataset frees");
 			}
 			dump_dtl(spa->spa_root_vdev, 0);
 		}

Copied: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5 (from r237202, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5	Sun Jun 17 21:48:40 2012	(r237213, copy of r237202, head/cddl/contrib/opensolaris/cmd/zpool/zpool-features.5)
@@ -0,0 +1,174 @@
+'\" te
+.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
+.\" Copyright (c) 2012 by Delphix. All rights reserved.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd May 28, 2012
+.Dt ZPOOL-FEATURES 8
+.Os
+.Sh NAME
+.Nm zpool-features
+.Nd ZFS pool feature descriptions
+.Sh DESCRIPTION
+ZFS pool on\-disk format versions are specified via "features" which replace
+the old on\-disk format numbers (the last supported on\-disk format number is
+28).
+To enable a feature on a pool use the
+.Xr zpool 8
+command to set the
+.Sy feature at feature_name
+property to
+.Ar enabled .
+.Pp
+The pool format does not affect file system version compatibility or the ability
+to send file systems between pools.
+.Pp
+Since most features can be enabled independently of each other the on\-disk
+format of the pool is specified by the set of all features marked as
+.Sy active
+on the pool. If the pool was created by another software version this set may
+include unsupported features.
+.Ss Identifying features
+Every feature has a guid of the form
+.Sy com.example:feature_name .
+The reverse DNS name ensures that the feature's guid is unique across all ZFS
+implementations. When unsupported features are encountered on a pool they will
+be identified by their guids.
+Refer to the documentation for the ZFS implementation that created the pool
+for information about those features.
+.Pp
+Each supported feature also has a short name.
+By convention a feature's short name is the portion of its guid which follows
+the ':' (e.g.
+.Sy com.example:feature_name
+would have the short name
+.Sy feature_name ),
+however a feature's short name may differ across ZFS implementations if
+following the convention would result in name conflicts.
+.Ss Feature states
+Features can be in one of three states:
+.Bl -tag
+.It Sy active
+This feature's on\-disk format changes are in effect on the pool.
+Support for this feature is required to import the pool in read\-write mode.
+If this feature is not read-only compatible, support is also required to
+import the pool in read\-only mode (see "Read\-only compatibility").
+.It Sy enabled
+An administrator has marked this feature as enabled on the pool, but the
+feature's on\-disk format changes have not been made yet.
+The pool can still be imported by software that does not support this feature,
+but changes may be made to the on\-disk format at any time which will move
+the feature to the
+.Sy active
+state.
+Some features may support returning to the
+.Sy enabled
+state after becoming
+.Sy active .
+See feature\-specific documentation for details.
+.It Sy disabled
+This feature's on\-disk format changes have not been made and will not be made
+unless an administrator moves the feature to the
+.Sy enabled
+state.
+Features cannot be disabled once they have been enabled.
+.El
+The state of supported features is exposed through pool properties of the form
+.Sy feature at short_name .
+.Ss Read\-only compatibility
+Some features may make on\-disk format changes that do not interfere with other
+software's ability to read from the pool.
+These features are referred to as "read\-only compatible".
+If all unsupported features on a pool are read\-only compatible, the pool can
+be imported in read\-only mode by setting the
+.Sy readonly
+property during import (see
+.Xr zpool 8
+for details on importing pools).
+.Ss Unsupported features
+For each unsupported feature enabled on an imported pool a pool property
+named
+.Sy unsupported at feature_guid
+will indicate why the import was allowed despite the unsupported feature.
+Possible values for this property are:
+.Bl -tag
+.It Sy inactive
+The feature is in the
+.Sy enabled
+state and therefore the pool's on\-disk format is still compatible with
+software that does not support this feature.
+.It Sy readonly
+The feature is read\-only compatible and the pool has been imported in
+read\-only mode.
+.El
+.Ss Feature dependencies
+Some features depend on other features being enabled in order to function
+properly.
+Enabling a feature will automatically enable any features it depends on.
+.Sh FEATURES
+The following features are supported on this system:
+.Bl -tag
+.It Sy async_destroy
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:async_destroy"
+.It GUID Ta com.delphix:async_destroy
+.It READ\-ONLY COMPATIBLE Ta yes
+.It DEPENDENCIES Ta none
+.El
+.Pp
+Destroying a file system requires traversing all of its data in order to
+return its used space to the pool.
+Without
+.Sy async_destroy
+the file system is not fully removed until all space has been reclaimed.
+If the destroy operation is interrupted by a reboot or power outage the next
+attempt to open the pool will need to complete the destroy operation
+synchronously.
+.Pp
+When
+.Sy async_destroy
+is enabled the file system's data will be reclaimed by a background process,
+allowing the destroy operation to complete without traversing the entire file
+system.
+The background process is able to resume interrupted destroys after the pool
+has been opened, eliminating the need to finish interrupted destroys as part
+of the open operation.
+The amount of space remaining to be reclaimed by the background process is
+available through the
+.Sy freeing
+property.
+.Sh SEE ALSO
+.Xr zpool 8
+.Sh AUTHORS
+This manual page is a
+.Xr mdoc 7
+reimplementation of the
+.Tn illumos
+manual page
+.Em zpool-features(5) ,
+modified and customized for
+.Fx
+and licensed under the Common Development and Distribution License
+.Pq Tn CDDL .
+.Pp
+The
+.Xr mdoc 7
+implementation of this manual page was initially written by
+.An Martin Matuska Aq mm at FreeBSD.org .

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool.8	Sun Jun 17 21:48:40 2012	(r237213)
@@ -1,5 +1,5 @@
 '\" te
-.\" Copyright (c) 2011, Martin Matuska <mm at FreeBSD.org>.
+.\" Copyright (c) 2012, Martin Matuska <mm at FreeBSD.org>.
 .\" All Rights Reserved.
 .\"
 .\" The contents of this file are subject to the terms of the
@@ -20,6 +20,7 @@
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
 .\" Copyright 2011, Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2011, Justin T. Gibbs <gibbs at FreeBSD.org>
+.\" Copyright (c) 2012 by Delphix. All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
@@ -47,7 +48,7 @@
 .Op Ar device
 .Nm
 .Cm create
-.Op Fl fn
+.Op Fl fnd
 .Op Fl o Ar property Ns = Ns Ar value
 .Ar ...
 .Op Fl O Ar file-system-property Ns = Ns Ar value
@@ -189,7 +190,7 @@ for information on managing datasets.
 A
 .Qq virtual device
 .Pq No vdev
-describes a single device or a collection of devices organized according to 
+describes a single device or a collection of devices organized according to
 certain performance and fault characteristics. The following virtual devices
 are supported:
 .Bl -tag
@@ -237,7 +238,7 @@ A
 group can have single-, double- , or triple parity, meaning that the
 .No raidz
 group can sustain one, two, or three failures, respectively, without
-losing any data. The 
+losing any data. The
 .Sy raidz1 No vdev
 type specifies a single-parity
 .No raidz
@@ -287,7 +288,7 @@ writes are load-balanced between devices
 .No raidz
 .No vdev
 types are not supported for the intent log. For more information,
-see the 
+see the
 .Qq Sx Intent Log
 section.
 .It Sy cache
@@ -309,13 +310,13 @@ A pool can have any number of virtual de
 (known as
 .Qq root
 .No vdev Ns s).
-Data is dynamically distributed across all top-level devices to balance data 
+Data is dynamically distributed across all top-level devices to balance data
 among devices. As new virtual devices are added,
 .Tn ZFS
 automatically places data on the newly available devices.
 .Pp
 Virtual devices are specified one at a time on the command line, separated by
-whitespace. The keywords 
+whitespace. The keywords
 .Qq mirror
 and
 .Qq raidz
@@ -428,7 +429,7 @@ allows devices to be associated with poo
 .Qq hot spares .
 These devices are not actively used in the pool, but when an active device
 fails, it is automatically replaced by a hot spare. To create a pool with hot
-spares, specify a 
+spares, specify a
 .Qq spare
 .No vdev
 with any number of devices. For example,
@@ -458,7 +459,7 @@ pools.
 .Pp
 Spares cannot replace log devices.
 .Ss Intent Log
-The 
+The
 .Tn ZFS
 Intent Log
 .Pq Tn ZIL
@@ -537,6 +538,16 @@ value of 1.76 indicates that 1.76 units 
 for a description of the deduplication feature.
 .It Sy free
 Number of blocks within the pool that are not allocated.
+.It Sy freeing
+After a file system or snapshot is destroyed, the space it was using is
+returned to the pool asynchronously.
+.Sy freeing
+is the amount of space remaining to be reclaimed.
+Over time
+.Sy freeing
+will decrease while
+.Sy free
+increases.
 .It Sy expandsize
 This property has currently no value on FreeBSD.
 .It Sy guid
@@ -552,11 +563,16 @@ or
 .Qq Sy UNAVAIL .
 .It Sy size
 Total size of the storage pool.
+.It Sy unsupported@ Ns Ar feature_guid
+Information about unsupported features that are enabled on the pool.
+See
+.Xr zpool-features 5
+for details.
 .It Sy used
 Amount of storage space used within the pool.
 .El
 .Pp
-These space usage properties report actual physical space available to the
+The space usage properties report actual physical space available to the
 storage pool. The physical space can be different from the total amount of
 space that any contained datasets can actually use. The amount of space used in
 a
@@ -582,7 +598,7 @@ the typical paths are not valid.
 .Sy altroot
 is not a persistent property. It is valid only while the system is up.
 Setting
-.Sy altroot 
+.Sy altroot
 defaults to using
 .Cm cachefile=none ,
 though this may be overridden using an explicit setting.
@@ -627,9 +643,9 @@ This property can also be referred to by
 .It Sy autoreplace Ns = Ns Cm on No | Cm off
 Controls automatic device replacement. If set to
 .Qq Cm off ,
-device replacement must be initiated by the administrator by using the 
+device replacement must be initiated by the administrator by using the
 .Qq Nm Cm replace
-command. If set to 
+command. If set to
 .Qq Cm on ,
 any new device, found in the same
 physical location as a device that previously belonged to the pool, is
@@ -650,13 +666,18 @@ pool configuration in a different locati
 .Qq Nm Cm import Fl c .
 Setting it to the special value
 .Qq Cm none
-creates a temporary pool that is never cached, and the special value 
+creates a temporary pool that is never cached, and the special value
 .Cm ''
 (empty string) uses the default location.
+.It Sy comment Ns = Ns Ar text
+A text string consisting of printable ASCII characters that will be stored
+such that it is available even if the pool becomes faulted.
+An administrator can provide additional information about a pool using this
+property.
 .It Sy dedupditto Ns = Ns Ar number
 Threshold for the number of block ditto copies. If the reference count for a
 deduplicated block increases above this number, a new ditto copy of this block
-is automatically stored. Deafult setting is
+is automatically stored. Default setting is
 .Cm 0 .
 .It Sy delegation Ns = Ns Cm on No | Cm off
 Controls whether a non-privileged user is granted access based on the dataset
@@ -686,6 +707,17 @@ requests that have yet to be committed t
 .It Sy panic
 Prints out a message to the console and generates a system crash dump.
 .El
+.It Sy feature@ Ns Ar feature_name Ns = Ns Sy enabled
+The value of this property is the current state of
+.Ar feature_name .
+The only valid value when setting this property is
+.Sy enabled
+which moves
+.Ar feature_name
+to the enabled state.
+See
+.Xr zpool-features 5
+for details on feature states.
 .It Sy listsnaps Ns = Ns Cm on No | Cm off
 Controls whether information about snapshots associated with this pool is
 output when
@@ -699,9 +731,9 @@ The current on-disk version of the pool.
 decreased. The preferred method of updating pools is with the
 .Qq Nm Cm upgrade
 command, though this property can be used when a specific version is needed
-for backwards compatibility. This property can be any number between 1 and the
-current version reported by
-.Qo Ic zpool upgrade -v Qc .
+for backwards compatibility. 
+Once feature flags is enabled on a pool this property will no longer have a
+value.
 .El
 .Sh SUBCOMMANDS
 All subcommands that modify state are logged persistently to the pool in their
@@ -810,7 +842,7 @@ do not actually discard any transactions
 .It Xo
 .Nm
 .Cm create
-.Op Fl fn
+.Op Fl fnd
 .Op Fl o Ar property Ns = Ns Ar value
 .Ar ...
 .Op Fl O Ar file-system-property Ns = Ns Ar value
@@ -859,9 +891,13 @@ The mount point must not exist or must b
 root dataset cannot be mounted. This can be overridden with the
 .Fl m
 option.
+.Pp
+By default all supported features are enabled on the new pool unless the
+.Fl d
+option is specified.
 .Bl -tag -width indent
 .It Fl f
-Forces use of 
+Forces use of
 .Ar vdev Ns s,
 even if they appear in use or specify a conflicting replication level.
 Not all devices can be overridden in this manner.
@@ -869,6 +905,17 @@ Not all devices can be overridden in thi
 Displays the configuration that would be used without actually creating the
 pool. The actual pool creation can still fail due to insufficient privileges or
 device sharing.
+.It Fl d
+Do not enable any features on the new pool.
+Individual features can be enabled by setting their corresponding properties
+to
+.Sy enabled
+with the
+.Fl o
+option.
+See
+.Xr zpool-features 5
+for details about feature properties.
 .It Xo
 .Fl o Ar property Ns = Ns Ar value
 .Op Fl o Ar property Ns = Ns Ar value
@@ -897,7 +944,7 @@ or
 .Qq Cm altroot Ns Pa /pool
 if
 .Sy altroot
-is specified. The mount point must be an absolute path, 
+is specified. The mount point must be an absolute path,
 .Qq Cm legacy ,
 or
 .Qq Cm none .
@@ -1234,7 +1281,7 @@ seconds until
 .Sy Ctrl-C
 is pressed. If no
 .Ar pools
-are specified, statistics for every pool in the system is shown. If 
+are specified, statistics for every pool in the system is shown. If
 .Ar count
 is specified, the command exits after
 .Ar count
@@ -1292,7 +1339,7 @@ When given an interval, the output is pr
 .Ar interval
 seconds until
 .Sy Ctrl-C
-is pressed. If 
+is pressed. If
 .Ar count
 is specified, the command exits after
 .Ar count
@@ -1301,6 +1348,8 @@ reports are printed.
 .It Fl H
 Scripted mode. Do not display headers, and separate fields by a single tab
 instead of arbitrary space.
+.It Fl v
+Show more detailed information.
 .It Fl o Ar property Ns Op , Ns Ar ...
 Comma-separated list of properties to display. See the
 .Qq Sx Properties
@@ -1396,7 +1445,7 @@ This is equivalent to attaching
 waiting for it to resilver, and then detaching
 .Ar old_device .
 .Pp
-The size of 
+The size of
 .Ar new_device
 must be greater than or equal to the minimum size
 of all the devices in a mirror or
@@ -1407,7 +1456,7 @@ configuration.
 is required if the pool is not redundant. If
 .Ar new_device
 is not specified, it defaults to
-.Ar old_device . 
+.Ar old_device .
 This form of replacement is useful after an existing disk has failed and has
 been physically replaced. In this case, the new disk may have the same
 .Pa /dev
@@ -1494,12 +1543,12 @@ unless overridden by a device specificat
 .Pp
 When using a
 .Ar device
-argument, 
+argument,
 .Cm split
-includes the specified device(s) in a new pool and, should any devices remain 
+includes the specified device(s) in a new pool and, should any devices remain
 unspecified, assigns the last device in each mirror
 .No vdev
-to that pool, as it does normally. If you are uncertain about the outcome of a 
+to that pool, as it does normally. If you are uncertain about the outcome of a
 .Cm split
 command, use the
 .Fl n
@@ -1552,7 +1601,7 @@ When given an interval, the output is pr
 .Ar interval
 seconds until
 .Sy Ctrl-C
-is pressed. If 
+is pressed. If
 .Ar count
 is specified, the command exits after
 .Ar count
@@ -1873,6 +1922,7 @@ Invalid command line options were specif
 .El
 .Sh SEE ALSO
 .Xr zfs 8
+.Xr zpool-features 5
 .Sh AUTHORS
 This manual page is a
 .Xr mdoc 7

Modified: projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Jun 17 21:47:24 2012	(r237212)
+++ projects/calloutng/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sun Jun 17 21:48:40 2012	(r237213)
@@ -54,6 +54,7 @@
 
 #include "zpool_util.h"
 #include "zfs_comutil.h"
+#include "zfeature_common.h"
 
 #include "statcommon.h"
 
@@ -207,7 +208,7 @@ get_usage(zpool_help_t idx) {
 	case HELP_CLEAR:
 		return (gettext("\tclear [-nF] <pool> [device]\n"));
 	case HELP_CREATE:
-		return (gettext("\tcreate [-fn] [-o property=value] ... \n"
+		return (gettext("\tcreate [-fnd] [-o property=value] ... \n"
 		    "\t    [-O file-system-property=value] ... \n"
 		    "\t    [-m mountpoint] [-R root] <pool> <vdev> ...\n"));
 	case HELP_DESTROY:
@@ -234,7 +235,7 @@ get_usage(zpool_help_t idx) {
 	case HELP_LABELCLEAR:
 		return (gettext("\tlabelclear [-f] <vdev>\n"));
 	case HELP_LIST:
-		return (gettext("\tlist [-H] [-o property[,...]] "
+		return (gettext("\tlist [-Hv] [-o property[,...]] "
 		    "[-T d|u] [pool] ... [interval [count]]\n"));
 	case HELP_OFFLINE:
 		return (gettext("\toffline [-t] <pool> <device> ...\n"));
@@ -339,6 +340,12 @@ usage(boolean_t requested)
 		/* Iterate over all properties */
 		(void) zprop_iter(print_prop_cb, fp, B_FALSE, B_TRUE,
 		    ZFS_TYPE_POOL);
+
+		(void) fprintf(fp, "\t%-15s   ", "feature at ...");
+		(void) fprintf(fp, "YES   disabled | enabled | active\n");
+
+		(void) fprintf(fp, gettext("\nThe feature@ properties must be "
+		    "appended with a feature name.\nSee zpool-features(5).\n"));
 	}
 
 	/*
@@ -405,12 +412,16 @@ add_prop_list(const char *propname, char
 	proplist = *props;
 
 	if (poolprop) {
-		if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL) {
+		if ((prop = zpool_name_to_prop(propname)) == ZPROP_INVAL &&
+		    !zpool_prop_feature(propname)) {
 			(void) fprintf(stderr, gettext("property '%s' is "
 			    "not a valid pool property\n"), propname);
 			return (2);
 		}
-		normnm = zpool_prop_to_name(prop);
+		if (zpool_prop_feature(propname))
+			normnm = propname;
+		else
+			normnm = zpool_prop_to_name(prop);
 	} else {
 		if ((fprop = zfs_name_to_prop(propname)) != ZPROP_INVAL) {
 			normnm = zfs_prop_to_name(fprop);
@@ -701,7 +712,7 @@ errout:
 }
 
 /*
- * zpool create [-fn] [-o property=value] ...
+ * zpool create [-fnd] [-o property=value] ...
  *		[-O file-system-property=value] ...
  *		[-R root] [-m mountpoint] <pool> <dev> ...
  *
@@ -710,8 +721,10 @@ errout:
  *		were to be created.
  *      -R	Create a pool under an alternate root
  *      -m	Set default mountpoint for the root dataset.  By default it's
- *      	'/<pool>'
+ *		'/<pool>'
  *	-o	Set property=value.
+ *	-d	Don't automatically enable all supported pool features
+ *		(individual features can be enabled with -o).
  *	-O	Set fsproperty=value in the pool's root file system
  *
  * Creates the named pool according to the given vdev specification.  The
@@ -724,6 +737,7 @@ zpool_do_create(int argc, char **argv)
 {
 	boolean_t force = B_FALSE;
 	boolean_t dryrun = B_FALSE;
+	boolean_t enable_all_pool_feat = B_TRUE;
 	int c;
 	nvlist_t *nvroot = NULL;
 	char *poolname;
@@ -735,7 +749,7 @@ zpool_do_create(int argc, char **argv)
 	char *propval;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":fnR:m:o:O:")) != -1) {
+	while ((c = getopt(argc, argv, ":fndR:m:o:O:")) != -1) {
 		switch (c) {
 		case 'f':
 			force = B_TRUE;
@@ -743,6 +757,9 @@ zpool_do_create(int argc, char **argv)
 		case 'n':
 			dryrun = B_TRUE;
 			break;
+		case 'd':
+			enable_all_pool_feat = B_FALSE;
+			break;
 		case 'R':
 			altroot = optarg;
 			if (add_prop_list(zpool_prop_to_name(
@@ -770,6 +787,21 @@ zpool_do_create(int argc, char **argv)
 
 			if (add_prop_list(optarg, propval, &props, B_TRUE))
 				goto errout;
+
+			/*
+			 * If the user is creating a pool that doesn't support
+			 * feature flags, don't enable any features.
+			 */
+			if (zpool_name_to_prop(optarg) == ZPOOL_PROP_VERSION) {
+				char *end;
+				u_longlong_t ver;
+
+				ver = strtoull(propval, &end, 10);
+				if (*end == '\0' &&
+				    ver < SPA_VERSION_FEATURES) {
+					enable_all_pool_feat = B_FALSE;
+				}
+			}
 			break;
 		case 'O':
 			if ((propval = strchr(optarg, '=')) == NULL) {
@@ -835,7 +867,6 @@ zpool_do_create(int argc, char **argv)
 		goto errout;
 	}
 
-
 	if (altroot != NULL && altroot[0] != '/') {
 		(void) fprintf(stderr, gettext("invalid alternate root '%s': "
 		    "must be an absolute path\n"), altroot);
@@ -917,6 +948,27 @@ zpool_do_create(int argc, char **argv)
 		/*
 		 * Hand off to libzfs.
 		 */
+		if (enable_all_pool_feat) {
+			int i;
+			for (i = 0; i < SPA_FEATURES; i++) {
+				char propname[MAXPATHLEN];
+				zfeature_info_t *feat = &spa_feature_table[i];
+
+				(void) snprintf(propname, sizeof (propname),
+				    "feature@%s", feat->fi_uname);
+
+				/*
+				 * Skip feature if user specified it manually
+				 * on the command line.
+				 */
+				if (nvlist_exists(props, propname))
+					continue;
+
+				if (add_prop_list(propname, ZFS_FEATURE_ENABLED,
+				    &props, B_TRUE) != 0)
+					goto errout;
+			}
+		}
 		if (zpool_create(g_zfs, poolname,
 		    nvroot, props, fsprops) == 0) {
 			zfs_handle_t *pool = zfs_open(g_zfs, poolname,
@@ -1249,6 +1301,10 @@ print_status_config(zpool_handle_t *zhp,
 			(void) printf(gettext("newer version"));
 			break;
 
+		case VDEV_AUX_UNSUP_FEAT:
+			(void) printf(gettext("unsupported feature(s)"));
+			break;
+
 		case VDEV_AUX_SPARED:
 			verify(nvlist_lookup_uint64(nv, ZPOOL_CONFIG_GUID,
 			    &cb.cb_guid) == 0);
@@ -1366,6 +1422,10 @@ print_import_config(const char *name, nv
 			(void) printf(gettext("newer version"));
 			break;
 
+		case VDEV_AUX_UNSUP_FEAT:
+			(void) printf(gettext("unsupported feature(s)"));
+			break;
+
 		case VDEV_AUX_ERR_EXCEEDED:
 			(void) printf(gettext("too many errors"));
 			break;
@@ -1532,6 +1592,20 @@ show_import(nvlist_t *config)
 		    "incompatible version.\n"));
 		break;
 
+	case ZPOOL_STATUS_UNSUP_FEAT_READ:
+		(void) printf(gettext("status: The pool uses the following "
+		    "feature(s) not supported on this sytem:\n"));
+		zpool_print_unsup_feat(config);
+		break;
+
+	case ZPOOL_STATUS_UNSUP_FEAT_WRITE:
+		(void) printf(gettext("status: The pool can only be accessed "
+		    "in read-only mode on this system. It\n\tcannot be "
+		    "accessed in read-write mode because it uses the "
+		    "following\n\tfeature(s) not supported on this system:\n"));
+		zpool_print_unsup_feat(config);
+		break;
+
 	case ZPOOL_STATUS_HOSTID_MISMATCH:
 		(void) printf(gettext(" status: The pool was last accessed by "
 		    "another system.\n"));
@@ -1589,6 +1663,20 @@ show_import(nvlist_t *config)
 			    "newer\n\tsoftware, or recreate the pool from "
 			    "backup.\n"));
 			break;
+		case ZPOOL_STATUS_UNSUP_FEAT_READ:

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

More information about the svn-src-projects mailing list