svn commit: r331929 - in user/markj/netdump: . cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/cmd/ztest cddl/contrib/o...

[Mark Johnston]

Author: markj
Date: Tue Apr  3 14:29:56 2018
New Revision: 331929
URL: https://svnweb.freebsd.org/changeset/base/331929

Log:
  MFH at r331928.

Added:
  user/markj/netdump/contrib/tzdata/ziguard.awk
     - copied unchanged from r331928, head/contrib/tzdata/ziguard.awk
  user/markj/netdump/lib/libc/gen/getentropy.3
     - copied unchanged from r331928, head/lib/libc/gen/getentropy.3
  user/markj/netdump/lib/libc/gen/getentropy.c
     - copied unchanged from r331928, head/lib/libc/gen/getentropy.c
  user/markj/netdump/lib/libc/sys/cpuset_getdomain.2
     - copied unchanged from r331928, head/lib/libc/sys/cpuset_getdomain.2
  user/markj/netdump/lib/libc/sys/getrandom.2
     - copied unchanged from r331928, head/lib/libc/sys/getrandom.2
  user/markj/netdump/lib/libc/tests/gen/getentropy_test.c
     - copied unchanged from r331928, head/lib/libc/tests/gen/getentropy_test.c
  user/markj/netdump/lib/libipt/
     - copied from r331928, head/lib/libipt/
  user/markj/netdump/share/man/man4/ocs_fc.4
     - copied unchanged from r331928, head/share/man/man4/ocs_fc.4
  user/markj/netdump/share/man/man4/vmci.4
     - copied unchanged from r331928, head/share/man/man4/vmci.4
  user/markj/netdump/share/man/man9/domainset.9
     - copied unchanged from r331928, head/share/man/man9/domainset.9
  user/markj/netdump/stand/lua/hook.lua
     - copied unchanged from r331928, head/stand/lua/hook.lua
  user/markj/netdump/stand/lua/logo-beastie.lua
     - copied unchanged from r331928, head/stand/lua/logo-beastie.lua
  user/markj/netdump/stand/lua/logo-beastiebw.lua
     - copied unchanged from r331928, head/stand/lua/logo-beastiebw.lua
  user/markj/netdump/stand/lua/logo-fbsdbw.lua
     - copied unchanged from r331928, head/stand/lua/logo-fbsdbw.lua
  user/markj/netdump/stand/lua/logo-orb.lua
     - copied unchanged from r331928, head/stand/lua/logo-orb.lua
  user/markj/netdump/stand/lua/logo-orbbw.lua
     - copied unchanged from r331928, head/stand/lua/logo-orbbw.lua
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash.descrip
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/THIRDPARTYLICENSE.cityhash.descrip
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/aggsum.c
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/aggsum.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/cityhash.c
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/cityhash.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_checkpoint.c
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_checkpoint.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/aggsum.h
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/aggsum.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/cityhash.h
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/cityhash.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_checkpoint.h
     - copied unchanged from r331928, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_checkpoint.h
  user/markj/netdump/sys/compat/linux/linux_errno.inc
     - copied unchanged from r331928, head/sys/compat/linux/linux_errno.inc
  user/markj/netdump/sys/contrib/dev/iwm/iwm-3168-22.fw.uu
     - copied unchanged from r331928, head/sys/contrib/dev/iwm/iwm-3168-22.fw.uu
  user/markj/netdump/sys/contrib/libb2/
     - copied from r331928, head/sys/contrib/libb2/
  user/markj/netdump/sys/contrib/zstd/doc/images/CSpeed2.png
     - copied unchanged from r331928, head/sys/contrib/zstd/doc/images/CSpeed2.png
  user/markj/netdump/sys/contrib/zstd/doc/images/DSpeed3.png
     - copied unchanged from r331928, head/sys/contrib/zstd/doc/images/DSpeed3.png
  user/markj/netdump/sys/contrib/zstd/lib/common/cpu.h
     - copied unchanged from r331928, head/sys/contrib/zstd/lib/common/cpu.h
  user/markj/netdump/sys/contrib/zstd/tests/checkTag.c
     - copied unchanged from r331928, head/sys/contrib/zstd/tests/checkTag.c
  user/markj/netdump/sys/crypto/blake2/
     - copied from r331928, head/sys/crypto/blake2/
  user/markj/netdump/sys/crypto/chacha20/chacha-sw.c
     - copied unchanged from r331928, head/sys/crypto/chacha20/chacha-sw.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_crspace.c
     - copied unchanged from r331928, head/sys/dev/mlx5/mlx5_core/mlx5_crspace.c
  user/markj/netdump/sys/dev/ocs_fc/
     - copied from r331928, head/sys/dev/ocs_fc/
  user/markj/netdump/sys/dev/tcp_log/
     - copied from r331928, head/sys/dev/tcp_log/
  user/markj/netdump/sys/dev/vmware/vmci/
     - copied from r331928, head/sys/dev/vmware/vmci/
  user/markj/netdump/sys/dts/arm/overlays/
     - copied from r331928, head/sys/dts/arm/overlays/
  user/markj/netdump/sys/kern/sys_getrandom.c
     - copied unchanged from r331928, head/sys/kern/sys_getrandom.c
  user/markj/netdump/sys/modules/adlink/
     - copied from r331928, head/sys/modules/adlink/
  user/markj/netdump/sys/modules/blake2/
     - copied from r331928, head/sys/modules/blake2/
  user/markj/netdump/sys/modules/dtb/overlays/
     - copied from r331928, head/sys/modules/dtb/overlays/
  user/markj/netdump/sys/modules/iwmfw/iwm3168fw/
     - copied from r331928, head/sys/modules/iwmfw/iwm3168fw/
  user/markj/netdump/sys/modules/ocs_fc/
     - copied from r331928, head/sys/modules/ocs_fc/
  user/markj/netdump/sys/modules/vmware/vmci/
     - copied from r331928, head/sys/modules/vmware/vmci/
  user/markj/netdump/sys/netinet/tcp_log_buf.c
     - copied unchanged from r331928, head/sys/netinet/tcp_log_buf.c
  user/markj/netdump/sys/netinet/tcp_log_buf.h
     - copied unchanged from r331928, head/sys/netinet/tcp_log_buf.h
  user/markj/netdump/sys/sys/_uio.h
     - copied unchanged from r331928, head/sys/sys/_uio.h
  user/markj/netdump/sys/tools/fdt/make_dtbo.sh
     - copied unchanged from r331928, head/sys/tools/fdt/make_dtbo.sh
  user/markj/netdump/tests/sys/kern/sys_getrandom.c
     - copied unchanged from r331928, head/tests/sys/kern/sys_getrandom.c
  user/markj/netdump/tests/sys/opencrypto/blake2-kat.h
     - copied unchanged from r331928, head/tests/sys/opencrypto/blake2-kat.h
  user/markj/netdump/tests/sys/opencrypto/blake2_test.c
     - copied unchanged from r331928, head/tests/sys/opencrypto/blake2_test.c
  user/markj/netdump/tools/tools/crypto/cryptocheck.c
     - copied unchanged from r331928, head/tools/tools/crypto/cryptocheck.c
Deleted:
  user/markj/netdump/stand/i386/libfirewire/fwohcireg.h
  user/markj/netdump/sys/contrib/zstd/doc/images/Cspeed4.png
  user/markj/netdump/sys/contrib/zstd/doc/images/Dspeed4.png
  user/markj/netdump/sys/net/if_iso88025subr.c
  user/markj/netdump/sys/net/iso88025.h
Modified:
  user/markj/netdump/Makefile.inc1
  user/markj/netdump/ObsoleteFiles.inc
  user/markj/netdump/UPDATING
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/markj/netdump/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/markj/netdump/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/markj/netdump/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
  user/markj/netdump/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
  user/markj/netdump/contrib/llvm/include/llvm/MC/MCAssembler.h
  user/markj/netdump/contrib/llvm/include/llvm/MC/MCELFStreamer.h
  user/markj/netdump/contrib/llvm/include/llvm/MC/MCStreamer.h
  user/markj/netdump/contrib/llvm/lib/MC/ELFObjectWriter.cpp
  user/markj/netdump/contrib/llvm/lib/MC/MCAsmStreamer.cpp
  user/markj/netdump/contrib/llvm/lib/MC/MCELFStreamer.cpp
  user/markj/netdump/contrib/llvm/lib/MC/MCParser/ELFAsmParser.cpp
  user/markj/netdump/contrib/llvm/lib/MC/MCStreamer.cpp
  user/markj/netdump/contrib/llvm/lib/Object/ModuleSymbolTable.cpp
  user/markj/netdump/contrib/llvm/lib/Object/RecordStreamer.cpp
  user/markj/netdump/contrib/llvm/lib/Object/RecordStreamer.h
  user/markj/netdump/contrib/llvm/projects/libunwind/include/__libunwind_config.h
  user/markj/netdump/contrib/llvm/projects/libunwind/include/libunwind.h
  user/markj/netdump/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
  user/markj/netdump/contrib/llvm/projects/libunwind/src/DwarfInstructions.hpp
  user/markj/netdump/contrib/llvm/projects/libunwind/src/Registers.hpp
  user/markj/netdump/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
  user/markj/netdump/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
  user/markj/netdump/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
  user/markj/netdump/contrib/llvm/projects/libunwind/src/config.h
  user/markj/netdump/contrib/llvm/projects/libunwind/src/libunwind.cpp
  user/markj/netdump/contrib/llvm/tools/lld/ELF/InputFiles.cpp
  user/markj/netdump/contrib/llvm/tools/lld/ELF/InputFiles.h
  user/markj/netdump/contrib/llvm/tools/lld/ELF/SymbolTable.cpp
  user/markj/netdump/contrib/tzdata/CONTRIBUTING
  user/markj/netdump/contrib/tzdata/Makefile
  user/markj/netdump/contrib/tzdata/NEWS
  user/markj/netdump/contrib/tzdata/africa
  user/markj/netdump/contrib/tzdata/antarctica
  user/markj/netdump/contrib/tzdata/asia
  user/markj/netdump/contrib/tzdata/australasia
  user/markj/netdump/contrib/tzdata/backzone
  user/markj/netdump/contrib/tzdata/checktab.awk
  user/markj/netdump/contrib/tzdata/europe
  user/markj/netdump/contrib/tzdata/northamerica
  user/markj/netdump/contrib/tzdata/southamerica
  user/markj/netdump/contrib/tzdata/theory.html
  user/markj/netdump/contrib/tzdata/version
  user/markj/netdump/contrib/tzdata/zishrink.awk
  user/markj/netdump/contrib/tzdata/zone.tab
  user/markj/netdump/contrib/tzdata/zone1970.tab
  user/markj/netdump/crypto/openssl/CHANGES
  user/markj/netdump/crypto/openssl/Configure
  user/markj/netdump/crypto/openssl/LICENSE
  user/markj/netdump/crypto/openssl/Makefile
  user/markj/netdump/crypto/openssl/NEWS
  user/markj/netdump/crypto/openssl/README
  user/markj/netdump/crypto/openssl/apps/app_rand.c
  user/markj/netdump/crypto/openssl/apps/apps.c
  user/markj/netdump/crypto/openssl/apps/ca.c
  user/markj/netdump/crypto/openssl/apps/ciphers.c
  user/markj/netdump/crypto/openssl/apps/cms.c
  user/markj/netdump/crypto/openssl/apps/dgst.c
  user/markj/netdump/crypto/openssl/apps/dsaparam.c
  user/markj/netdump/crypto/openssl/apps/ecparam.c
  user/markj/netdump/crypto/openssl/apps/enc.c
  user/markj/netdump/crypto/openssl/apps/errstr.c
  user/markj/netdump/crypto/openssl/apps/ocsp.c
  user/markj/netdump/crypto/openssl/apps/openssl.c
  user/markj/netdump/crypto/openssl/apps/passwd.c
  user/markj/netdump/crypto/openssl/apps/pkcs12.c
  user/markj/netdump/crypto/openssl/apps/pkcs8.c
  user/markj/netdump/crypto/openssl/apps/rand.c
  user/markj/netdump/crypto/openssl/apps/req.c
  user/markj/netdump/crypto/openssl/apps/s_client.c
  user/markj/netdump/crypto/openssl/apps/s_server.c
  user/markj/netdump/crypto/openssl/apps/s_socket.c
  user/markj/netdump/crypto/openssl/apps/s_time.c
  user/markj/netdump/crypto/openssl/apps/speed.c
  user/markj/netdump/crypto/openssl/apps/x509.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_gentm.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_mbstr.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_object.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_strex.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_time.c
  user/markj/netdump/crypto/openssl/crypto/asn1/a_utctm.c
  user/markj/netdump/crypto/openssl/crypto/asn1/asn1.h
  user/markj/netdump/crypto/openssl/crypto/asn1/asn1_err.c
  user/markj/netdump/crypto/openssl/crypto/asn1/asn1_lib.c
  user/markj/netdump/crypto/openssl/crypto/asn1/asn1_par.c
  user/markj/netdump/crypto/openssl/crypto/asn1/asn_mime.c
  user/markj/netdump/crypto/openssl/crypto/asn1/t_x509a.c
  user/markj/netdump/crypto/openssl/crypto/asn1/tasn_dec.c
  user/markj/netdump/crypto/openssl/crypto/asn1/tasn_prn.c
  user/markj/netdump/crypto/openssl/crypto/bf/bftest.c
  user/markj/netdump/crypto/openssl/crypto/bio/b_dump.c
  user/markj/netdump/crypto/openssl/crypto/bio/b_print.c
  user/markj/netdump/crypto/openssl/crypto/bio/bio_cb.c
  user/markj/netdump/crypto/openssl/crypto/bio/bss_bio.c
  user/markj/netdump/crypto/openssl/crypto/bio/bss_conn.c
  user/markj/netdump/crypto/openssl/crypto/bio/bss_file.c
  user/markj/netdump/crypto/openssl/crypto/bn/bn_exp.c
  user/markj/netdump/crypto/openssl/crypto/bn/bn_lib.c
  user/markj/netdump/crypto/openssl/crypto/bn/bn_mont.c
  user/markj/netdump/crypto/openssl/crypto/bn/bn_print.c
  user/markj/netdump/crypto/openssl/crypto/bn/bntest.c
  user/markj/netdump/crypto/openssl/crypto/bn/expspeed.c
  user/markj/netdump/crypto/openssl/crypto/bn/exptest.c
  user/markj/netdump/crypto/openssl/crypto/conf/conf_def.c
  user/markj/netdump/crypto/openssl/crypto/conf/conf_mod.c
  user/markj/netdump/crypto/openssl/crypto/des/destest.c
  user/markj/netdump/crypto/openssl/crypto/des/ecb_enc.c
  user/markj/netdump/crypto/openssl/crypto/des/fcrypt.c
  user/markj/netdump/crypto/openssl/crypto/des/read_pwd.c
  user/markj/netdump/crypto/openssl/crypto/des/set_key.c
  user/markj/netdump/crypto/openssl/crypto/dh/dhtest.c
  user/markj/netdump/crypto/openssl/crypto/dsa/dsatest.c
  user/markj/netdump/crypto/openssl/crypto/ec/ec_lib.c
  user/markj/netdump/crypto/openssl/crypto/ec/ec_mult.c
  user/markj/netdump/crypto/openssl/crypto/ec/ecp_nistp224.c
  user/markj/netdump/crypto/openssl/crypto/ec/ecp_nistp256.c
  user/markj/netdump/crypto/openssl/crypto/ec/ecp_nistp521.c
  user/markj/netdump/crypto/openssl/crypto/ec/ecp_nistz256.c
  user/markj/netdump/crypto/openssl/crypto/ec/ecp_smpl.c
  user/markj/netdump/crypto/openssl/crypto/ec/ectest.c
  user/markj/netdump/crypto/openssl/crypto/ecdh/ecdhtest.c
  user/markj/netdump/crypto/openssl/crypto/engine/eng_cryptodev.c
  user/markj/netdump/crypto/openssl/crypto/engine/eng_table.c
  user/markj/netdump/crypto/openssl/crypto/err/err.c
  user/markj/netdump/crypto/openssl/crypto/err/err_prn.c
  user/markj/netdump/crypto/openssl/crypto/evp/bio_b64.c
  user/markj/netdump/crypto/openssl/crypto/evp/digest.c
  user/markj/netdump/crypto/openssl/crypto/evp/e_aes.c
  user/markj/netdump/crypto/openssl/crypto/evp/e_camellia.c
  user/markj/netdump/crypto/openssl/crypto/evp/evp_enc.c
  user/markj/netdump/crypto/openssl/crypto/evp/evp_locl.h
  user/markj/netdump/crypto/openssl/crypto/evp/evp_pbe.c
  user/markj/netdump/crypto/openssl/crypto/evp/evp_test.c
  user/markj/netdump/crypto/openssl/crypto/evp/openbsd_hw.c
  user/markj/netdump/crypto/openssl/crypto/evp/p5_crpt2.c
  user/markj/netdump/crypto/openssl/crypto/hmac/hmac.c
  user/markj/netdump/crypto/openssl/crypto/jpake/jpake.c
  user/markj/netdump/crypto/openssl/crypto/md2/md2_dgst.c
  user/markj/netdump/crypto/openssl/crypto/md4/md4.c
  user/markj/netdump/crypto/openssl/crypto/mem_dbg.c
  user/markj/netdump/crypto/openssl/crypto/o_init.c
  user/markj/netdump/crypto/openssl/crypto/o_time.c
  user/markj/netdump/crypto/openssl/crypto/objects/o_names.c
  user/markj/netdump/crypto/openssl/crypto/objects/obj_dat.c
  user/markj/netdump/crypto/openssl/crypto/opensslv.h
  user/markj/netdump/crypto/openssl/crypto/pem/pem_info.c
  user/markj/netdump/crypto/openssl/crypto/pem/pem_lib.c
  user/markj/netdump/crypto/openssl/crypto/pkcs7/pk7_doit.c
  user/markj/netdump/crypto/openssl/crypto/rand/md_rand.c
  user/markj/netdump/crypto/openssl/crypto/rand/rand_egd.c
  user/markj/netdump/crypto/openssl/crypto/rand/rand_unix.c
  user/markj/netdump/crypto/openssl/crypto/rsa/rsa_crpt.c
  user/markj/netdump/crypto/openssl/crypto/rsa/rsa_gen.c
  user/markj/netdump/crypto/openssl/crypto/rsa/rsa_pss.c
  user/markj/netdump/crypto/openssl/crypto/rsa/rsa_test.c
  user/markj/netdump/crypto/openssl/crypto/srp/srp_grps.h
  user/markj/netdump/crypto/openssl/crypto/threads/mttest.c
  user/markj/netdump/crypto/openssl/crypto/ts/Makefile
  user/markj/netdump/crypto/openssl/crypto/ts/ts_rsp_sign.c
  user/markj/netdump/crypto/openssl/crypto/ui/ui_openssl.c
  user/markj/netdump/crypto/openssl/crypto/x509/x509_txt.c
  user/markj/netdump/crypto/openssl/crypto/x509/x509_v3.c
  user/markj/netdump/crypto/openssl/crypto/x509/x509_vpm.c
  user/markj/netdump/crypto/openssl/crypto/x509v3/v3_alt.c
  user/markj/netdump/crypto/openssl/crypto/x509v3/v3_conf.c
  user/markj/netdump/crypto/openssl/crypto/x509v3/v3_info.c
  user/markj/netdump/crypto/openssl/doc/apps/ca.pod
  user/markj/netdump/crypto/openssl/doc/apps/ecparam.pod
  user/markj/netdump/crypto/openssl/doc/apps/s_client.pod
  user/markj/netdump/crypto/openssl/doc/apps/verify.pod
  user/markj/netdump/crypto/openssl/doc/apps/x509.pod
  user/markj/netdump/crypto/openssl/doc/crypto/ASN1_STRING_length.pod
  user/markj/netdump/crypto/openssl/doc/crypto/BIO_s_mem.pod
  user/markj/netdump/crypto/openssl/doc/crypto/BN_zero.pod
  user/markj/netdump/crypto/openssl/doc/crypto/EVP_EncryptInit.pod
  user/markj/netdump/crypto/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod
  user/markj/netdump/crypto/openssl/doc/crypto/threads.pod
  user/markj/netdump/crypto/openssl/engines/ccgost/README.gost
  user/markj/netdump/crypto/openssl/engines/ccgost/gost_eng.c
  user/markj/netdump/crypto/openssl/engines/e_atalla.c
  user/markj/netdump/crypto/openssl/ssl/Makefile
  user/markj/netdump/crypto/openssl/ssl/bad_dtls_test.c
  user/markj/netdump/crypto/openssl/ssl/d1_lib.c
  user/markj/netdump/crypto/openssl/ssl/d1_pkt.c
  user/markj/netdump/crypto/openssl/ssl/fatalerrtest.c
  user/markj/netdump/crypto/openssl/ssl/kssl.c
  user/markj/netdump/crypto/openssl/ssl/s23_srvr.c
  user/markj/netdump/crypto/openssl/ssl/s2_clnt.c
  user/markj/netdump/crypto/openssl/ssl/s2_enc.c
  user/markj/netdump/crypto/openssl/ssl/s2_lib.c
  user/markj/netdump/crypto/openssl/ssl/s2_srvr.c
  user/markj/netdump/crypto/openssl/ssl/s3_clnt.c
  user/markj/netdump/crypto/openssl/ssl/s3_lib.c
  user/markj/netdump/crypto/openssl/ssl/s3_pkt.c
  user/markj/netdump/crypto/openssl/ssl/s3_srvr.c
  user/markj/netdump/crypto/openssl/ssl/ssl_cert.c
  user/markj/netdump/crypto/openssl/ssl/ssl_lib.c
  user/markj/netdump/crypto/openssl/ssl/ssl_sess.c
  user/markj/netdump/crypto/openssl/ssl/ssltest.c
  user/markj/netdump/crypto/openssl/ssl/t1_enc.c
  user/markj/netdump/crypto/openssl/ssl/t1_lib.c
  user/markj/netdump/crypto/openssl/ssl/t1_trce.c
  user/markj/netdump/etc/mtree/BSD.include.dist
  user/markj/netdump/etc/rc.d/pf
  user/markj/netdump/include/Makefile
  user/markj/netdump/include/unistd.h
  user/markj/netdump/lib/Makefile
  user/markj/netdump/lib/libc/gen/Makefile.inc
  user/markj/netdump/lib/libc/gen/Symbol.map
  user/markj/netdump/lib/libc/gen/arc4random.c
  user/markj/netdump/lib/libc/include/libc_private.h
  user/markj/netdump/lib/libc/sys/Makefile.inc
  user/markj/netdump/lib/libc/sys/Symbol.map
  user/markj/netdump/lib/libc/sys/cpuset.2
  user/markj/netdump/lib/libc/sys/cpuset_getaffinity.2
  user/markj/netdump/lib/libc/sys/mlock.2
  user/markj/netdump/lib/libc/tests/gen/Makefile
  user/markj/netdump/lib/libdl/Makefile
  user/markj/netdump/lib/libjail/jail.c
  user/markj/netdump/lib/libsysdecode/errno.c
  user/markj/netdump/lib/libthr/thread/thr_cancel.c
  user/markj/netdump/lib/libusb/libusb20.c
  user/markj/netdump/lib/libusb/libusb20_int.h
  user/markj/netdump/lib/libusb/libusb20_ugen20.c
  user/markj/netdump/libexec/tftpd/tests/functional.c
  user/markj/netdump/release/Makefile.gce
  user/markj/netdump/release/amd64/mkisoimages.sh
  user/markj/netdump/release/arm/BANANAPI.conf
  user/markj/netdump/release/arm/BEAGLEBONE.conf
  user/markj/netdump/release/arm/CUBIEBOARD.conf
  user/markj/netdump/release/arm/CUBIEBOARD2.conf
  user/markj/netdump/release/arm/CUBOX-HUMMINGBOARD.conf
  user/markj/netdump/release/arm/GUMSTIX.conf
  user/markj/netdump/release/arm/PANDABOARD.conf
  user/markj/netdump/release/arm/RPI-B.conf
  user/markj/netdump/release/arm/RPI2.conf
  user/markj/netdump/release/arm/WANDBOARD.conf
  user/markj/netdump/release/arm64/RPI3.conf
  user/markj/netdump/release/tools/gce.conf
  user/markj/netdump/sbin/ifconfig/af_link.c
  user/markj/netdump/sbin/ifconfig/ifconfig.c
  user/markj/netdump/sbin/ipfw/ipfw2.c
  user/markj/netdump/sbin/ipfw/ipfw2.h
  user/markj/netdump/sbin/ipfw/main.c
  user/markj/netdump/sbin/mount/mount.8
  user/markj/netdump/sbin/route/route.c
  user/markj/netdump/sbin/savecore/savecore.8
  user/markj/netdump/secure/lib/libcrypto/Makefile.inc
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_STRING_length.3
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_STRING_new.3
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_TIME_set.3
  user/markj/netdump/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_ctrl.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_base64.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_buffer.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_cipher.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_md.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_null.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_f_ssl.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_find_type.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_new.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_new_CMS.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_push.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_read.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_accept.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_bio.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_connect.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_fd.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_file.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_mem.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_null.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_s_socket.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_set_callback.3
  user/markj/netdump/secure/lib/libcrypto/man/BIO_should_retry.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_BLINDING_new.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_CTX_new.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_CTX_start.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_add.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_add_word.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_bn2bin.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_cmp.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_copy.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_generate_prime.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_mod_inverse.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_new.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_num_bytes.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_rand.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_set_bit.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_swap.3
  user/markj/netdump/secure/lib/libcrypto/man/BN_zero.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_add0_cert.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_add1_signer.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_compress.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_decrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_encrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_final.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_get0_type.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_sign_receipt.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_uncompress.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_verify.3
  user/markj/netdump/secure/lib/libcrypto/man/CMS_verify_receipt.3
  user/markj/netdump/secure/lib/libcrypto/man/CONF_modules_free.3
  user/markj/netdump/secure/lib/libcrypto/man/CONF_modules_load_file.3
  user/markj/netdump/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_generate_key.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_generate_parameters.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_new.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_set_method.3
  user/markj/netdump/secure/lib/libcrypto/man/DH_size.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_SIG_new.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_do_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_dup_DH.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_generate_key.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_generate_parameters.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_new.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_set_method.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/DSA_size.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_GFp_simple_method.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_GROUP_copy.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_GROUP_new.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_KEY_new.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_POINT_add.3
  user/markj/netdump/secure/lib/libcrypto/man/EC_POINT_new.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_GET_LIB.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_clear_error.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_error_string.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_get_error.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_load_strings.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_print_errors.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_put_error.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_remove_state.3
  user/markj/netdump/secure/lib/libcrypto/man/ERR_set_mark.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_BytesToKey.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_DigestInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_EncodeInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_EncryptInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_OpenInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_meth_new.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_new.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_SealInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_SignInit.3
  user/markj/netdump/secure/lib/libcrypto/man/EVP_VerifyInit.3
  user/markj/netdump/secure/lib/libcrypto/man/OBJ_nid2obj.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_Applink.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_config.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_instrument_bus.3
  user/markj/netdump/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  user/markj/netdump/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  user/markj/netdump/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  user/markj/netdump/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS12_create.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS12_parse.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS7_decrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS7_encrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS7_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  user/markj/netdump/secure/lib/libcrypto/man/PKCS7_verify.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_add.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_bytes.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_cleanup.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_egd.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_load_file.3
  user/markj/netdump/secure/lib/libcrypto/man/RAND_set_rand_method.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_blinding_on.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_check_key.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_generate_key.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_new.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_print.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_private_encrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_public_encrypt.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_set_method.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_sign.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  user/markj/netdump/secure/lib/libcrypto/man/RSA_size.3
  user/markj/netdump/secure/lib/libcrypto/man/SMIME_read_CMS.3
  user/markj/netdump/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  user/markj/netdump/secure/lib/libcrypto/man/SMIME_write_CMS.3
  user/markj/netdump/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_check_host.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_check_private_key.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_new.3
  user/markj/netdump/secure/lib/libcrypto/man/X509_verify_cert.3
  user/markj/netdump/secure/lib/libcrypto/man/bio.3
  user/markj/netdump/secure/lib/libcrypto/man/blowfish.3
  user/markj/netdump/secure/lib/libcrypto/man/bn.3
  user/markj/netdump/secure/lib/libcrypto/man/bn_internal.3
  user/markj/netdump/secure/lib/libcrypto/man/buffer.3
  user/markj/netdump/secure/lib/libcrypto/man/crypto.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_CMS_ContentInfo.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_DHparams.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_ECPKParameters.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_ECPrivateKey.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_PrivateKey.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509_CRL.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509_NAME.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509_REQ.3
  user/markj/netdump/secure/lib/libcrypto/man/d2i_X509_SIG.3
  user/markj/netdump/secure/lib/libcrypto/man/des.3
  user/markj/netdump/secure/lib/libcrypto/man/dh.3
  user/markj/netdump/secure/lib/libcrypto/man/dsa.3
  user/markj/netdump/secure/lib/libcrypto/man/ec.3
  user/markj/netdump/secure/lib/libcrypto/man/ecdsa.3
  user/markj/netdump/secure/lib/libcrypto/man/engine.3
  user/markj/netdump/secure/lib/libcrypto/man/err.3
  user/markj/netdump/secure/lib/libcrypto/man/evp.3
  user/markj/netdump/secure/lib/libcrypto/man/hmac.3
  user/markj/netdump/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  user/markj/netdump/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  user/markj/netdump/secure/lib/libcrypto/man/lh_stats.3
  user/markj/netdump/secure/lib/libcrypto/man/lhash.3
  user/markj/netdump/secure/lib/libcrypto/man/md5.3
  user/markj/netdump/secure/lib/libcrypto/man/mdc2.3
  user/markj/netdump/secure/lib/libcrypto/man/pem.3
  user/markj/netdump/secure/lib/libcrypto/man/rand.3
  user/markj/netdump/secure/lib/libcrypto/man/rc4.3
  user/markj/netdump/secure/lib/libcrypto/man/ripemd.3
  user/markj/netdump/secure/lib/libcrypto/man/rsa.3
  user/markj/netdump/secure/lib/libcrypto/man/sha.3
  user/markj/netdump/secure/lib/libcrypto/man/threads.3
  user/markj/netdump/secure/lib/libcrypto/man/ui.3
  user/markj/netdump/secure/lib/libcrypto/man/ui_compat.3
  user/markj/netdump/secure/lib/libcrypto/man/x509.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  user/markj/netdump/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_CTX_new.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_CTX_set1_prefix.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_CTX_set_flags.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_CTX_set_ssl_ctx.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_cmd.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CONF_cmd_argv.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_add1_chain_cert.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_add_session.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_ctrl.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_free.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_get0_param.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_new.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_sess_number.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_sessions.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set1_curves.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set1_verify_cert_store.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_alpn_select_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_cert_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_custom_cli_ext.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_mode.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_options.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_read_ahead.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_tlsext_servername_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_set_verify.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  user/markj/netdump/secure/lib/libssl/man/SSL_CTX_use_serverinfo.3
  user/markj/netdump/secure/lib/libssl/man/SSL_SESSION_free.3
  user/markj/netdump/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  user/markj/netdump/secure/lib/libssl/man/SSL_SESSION_get_time.3
  user/markj/netdump/secure/lib/libssl/man/SSL_accept.3
  user/markj/netdump/secure/lib/libssl/man/SSL_alert_type_string.3
  user/markj/netdump/secure/lib/libssl/man/SSL_check_chain.3
  user/markj/netdump/secure/lib/libssl/man/SSL_clear.3
  user/markj/netdump/secure/lib/libssl/man/SSL_connect.3
  user/markj/netdump/secure/lib/libssl/man/SSL_do_handshake.3
  user/markj/netdump/secure/lib/libssl/man/SSL_export_keying_material.3
  user/markj/netdump/secure/lib/libssl/man/SSL_free.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_ciphers.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_client_CA_list.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_current_cipher.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_default_timeout.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_error.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_ex_new_index.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_fd.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_peer_certificate.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_psk_identity.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_rbio.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_session.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_verify_result.3
  user/markj/netdump/secure/lib/libssl/man/SSL_get_version.3
  user/markj/netdump/secure/lib/libssl/man/SSL_library_init.3
  user/markj/netdump/secure/lib/libssl/man/SSL_load_client_CA_file.3
  user/markj/netdump/secure/lib/libssl/man/SSL_new.3
  user/markj/netdump/secure/lib/libssl/man/SSL_pending.3
  user/markj/netdump/secure/lib/libssl/man/SSL_read.3
  user/markj/netdump/secure/lib/libssl/man/SSL_rstate_string.3
  user/markj/netdump/secure/lib/libssl/man/SSL_session_reused.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_bio.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_connect_state.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_fd.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_session.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_shutdown.3
  user/markj/netdump/secure/lib/libssl/man/SSL_set_verify_result.3
  user/markj/netdump/secure/lib/libssl/man/SSL_shutdown.3
  user/markj/netdump/secure/lib/libssl/man/SSL_state_string.3
  user/markj/netdump/secure/lib/libssl/man/SSL_want.3
  user/markj/netdump/secure/lib/libssl/man/SSL_write.3
  user/markj/netdump/secure/lib/libssl/man/d2i_SSL_SESSION.3
  user/markj/netdump/secure/lib/libssl/man/ssl.3
  user/markj/netdump/secure/usr.bin/openssl/man/CA.pl.1
  user/markj/netdump/secure/usr.bin/openssl/man/asn1parse.1
  user/markj/netdump/secure/usr.bin/openssl/man/ca.1
  user/markj/netdump/secure/usr.bin/openssl/man/ciphers.1
  user/markj/netdump/secure/usr.bin/openssl/man/cms.1
  user/markj/netdump/secure/usr.bin/openssl/man/crl.1
  user/markj/netdump/secure/usr.bin/openssl/man/crl2pkcs7.1
  user/markj/netdump/secure/usr.bin/openssl/man/dgst.1
  user/markj/netdump/secure/usr.bin/openssl/man/dhparam.1
  user/markj/netdump/secure/usr.bin/openssl/man/dsa.1
  user/markj/netdump/secure/usr.bin/openssl/man/dsaparam.1
  user/markj/netdump/secure/usr.bin/openssl/man/ec.1
  user/markj/netdump/secure/usr.bin/openssl/man/ecparam.1
  user/markj/netdump/secure/usr.bin/openssl/man/enc.1
  user/markj/netdump/secure/usr.bin/openssl/man/errstr.1
  user/markj/netdump/secure/usr.bin/openssl/man/gendsa.1
  user/markj/netdump/secure/usr.bin/openssl/man/genpkey.1
  user/markj/netdump/secure/usr.bin/openssl/man/genrsa.1
  user/markj/netdump/secure/usr.bin/openssl/man/nseq.1
  user/markj/netdump/secure/usr.bin/openssl/man/ocsp.1
  user/markj/netdump/secure/usr.bin/openssl/man/openssl.1
  user/markj/netdump/secure/usr.bin/openssl/man/passwd.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkcs12.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkcs7.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkcs8.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkey.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkeyparam.1
  user/markj/netdump/secure/usr.bin/openssl/man/pkeyutl.1
  user/markj/netdump/secure/usr.bin/openssl/man/rand.1
  user/markj/netdump/secure/usr.bin/openssl/man/req.1
  user/markj/netdump/secure/usr.bin/openssl/man/rsa.1
  user/markj/netdump/secure/usr.bin/openssl/man/rsautl.1
  user/markj/netdump/secure/usr.bin/openssl/man/s_client.1
  user/markj/netdump/secure/usr.bin/openssl/man/s_server.1
  user/markj/netdump/secure/usr.bin/openssl/man/s_time.1
  user/markj/netdump/secure/usr.bin/openssl/man/sess_id.1
  user/markj/netdump/secure/usr.bin/openssl/man/smime.1
  user/markj/netdump/secure/usr.bin/openssl/man/speed.1
  user/markj/netdump/secure/usr.bin/openssl/man/spkac.1
  user/markj/netdump/secure/usr.bin/openssl/man/ts.1
  user/markj/netdump/secure/usr.bin/openssl/man/tsget.1
  user/markj/netdump/secure/usr.bin/openssl/man/verify.1
  user/markj/netdump/secure/usr.bin/openssl/man/version.1
  user/markj/netdump/secure/usr.bin/openssl/man/x509.1
  user/markj/netdump/secure/usr.bin/openssl/man/x509v3_config.1
  user/markj/netdump/share/man/man4/Makefile
  user/markj/netdump/share/man/man4/altq.4
  user/markj/netdump/share/man/man4/audit.4
  user/markj/netdump/share/man/man4/cm.4
  user/markj/netdump/share/man/man4/fpa.4
  user/markj/netdump/share/man/man4/iwm.4
  user/markj/netdump/share/man/man4/iwmfw.4
  user/markj/netdump/share/man/man4/snd_hda.4
  user/markj/netdump/share/man/man7/development.7
  user/markj/netdump/share/man/man7/hier.7
  user/markj/netdump/share/man/man7/release.7
  user/markj/netdump/share/man/man9/MODULE_PNP_INFO.9
  user/markj/netdump/share/man/man9/Makefile
  user/markj/netdump/share/man/man9/altq.9
  user/markj/netdump/share/man/man9/bhnd.9
  user/markj/netdump/share/man/man9/malloc.9
  user/markj/netdump/share/man/man9/pfil.9
  user/markj/netdump/share/man/man9/style.9
  user/markj/netdump/share/man/man9/zone.9
  user/markj/netdump/share/misc/bsd-family-tree
  user/markj/netdump/share/misc/committers-ports.dot
  user/markj/netdump/share/misc/committers-src.dot
  user/markj/netdump/share/misc/pci_vendors
  user/markj/netdump/share/mk/bsd.dtb.mk
  user/markj/netdump/share/mk/bsd.kmod.mk
  user/markj/netdump/share/mk/bsd.libnames.mk
  user/markj/netdump/share/mk/bsd.own.mk
  user/markj/netdump/share/mk/src.libnames.mk
  user/markj/netdump/share/mk/src.opts.mk
  user/markj/netdump/stand/common/bootstrap.h
  user/markj/netdump/stand/defaults/loader.conf
  user/markj/netdump/stand/defaults/loader.conf.5
  user/markj/netdump/stand/efi/boot1/boot1.c
  user/markj/netdump/stand/efi/libefi/efi_console.c
  user/markj/netdump/stand/efi/libefi/efinet.c
  user/markj/netdump/stand/efi/loader/framebuffer.c
  user/markj/netdump/stand/forth/Makefile
  user/markj/netdump/stand/forth/efi.4th
  user/markj/netdump/stand/forth/loader.rc
  user/markj/netdump/stand/i386/libfirewire/firewire.c
  user/markj/netdump/stand/i386/libfirewire/fwohci.c
  user/markj/netdump/stand/i386/libfirewire/fwohci.h
  user/markj/netdump/stand/i386/libi386/biosdisk.c
  user/markj/netdump/stand/i386/libi386/vidconsole.c
  user/markj/netdump/stand/i386/loader/loader.rc
  user/markj/netdump/stand/i386/zfsboot/zfsboot.8
  user/markj/netdump/stand/lua/Makefile
  user/markj/netdump/stand/lua/color.lua
  user/markj/netdump/stand/lua/config.lua
  user/markj/netdump/stand/lua/core.lua
  user/markj/netdump/stand/lua/core.lua.8
  user/markj/netdump/stand/lua/drawer.lua
  user/markj/netdump/stand/lua/loader.lua
  user/markj/netdump/stand/lua/menu.lua
  user/markj/netdump/stand/lua/screen.lua
  user/markj/netdump/sys/amd64/acpica/acpi_wakecode.S
  user/markj/netdump/sys/amd64/amd64/apic_vector.S
  user/markj/netdump/sys/amd64/amd64/atpic_vector.S
  user/markj/netdump/sys/amd64/amd64/cpu_switch.S
  user/markj/netdump/sys/amd64/amd64/db_interface.c
  user/markj/netdump/sys/amd64/amd64/exception.S
  user/markj/netdump/sys/amd64/amd64/fpu.c
  user/markj/netdump/sys/amd64/amd64/gdb_machdep.c
  user/markj/netdump/sys/amd64/amd64/locore.S
  user/markj/netdump/sys/amd64/amd64/machdep.c
  user/markj/netdump/sys/amd64/amd64/mpboot.S
  user/markj/netdump/sys/amd64/amd64/ptrace_machdep.c
  user/markj/netdump/sys/amd64/amd64/sigtramp.S
  user/markj/netdump/sys/amd64/amd64/support.S
  user/markj/netdump/sys/amd64/amd64/trap.c
  user/markj/netdump/sys/amd64/amd64/vm_machdep.c
  user/markj/netdump/sys/amd64/amd64/xen-locore.S
  user/markj/netdump/sys/amd64/conf/GENERIC
  user/markj/netdump/sys/amd64/ia32/ia32_exception.S
  user/markj/netdump/sys/amd64/ia32/ia32_signal.c
  user/markj/netdump/sys/amd64/ia32/ia32_sigtramp.S
  user/markj/netdump/sys/amd64/ia32/ia32_syscall.c
  user/markj/netdump/sys/amd64/include/intr_machdep.h
  user/markj/netdump/sys/amd64/linux/linux_machdep.c
  user/markj/netdump/sys/amd64/linux/linux_support.s
  user/markj/netdump/sys/amd64/linux/linux_sysvec.c
  user/markj/netdump/sys/amd64/linux32/linux32_machdep.c
  user/markj/netdump/sys/amd64/linux32/linux32_support.s
  user/markj/netdump/sys/amd64/linux32/linux32_sysvec.c
  user/markj/netdump/sys/amd64/sgx/sgx_support.S
  user/markj/netdump/sys/arm/allwinner/aw_sid.c
  user/markj/netdump/sys/arm/arm/bcopy_page.S
  user/markj/netdump/sys/arm/arm/bcopyinout.S
  user/markj/netdump/sys/arm/arm/copystr.S
  user/markj/netdump/sys/arm/arm/cpu_asm-v6.S
  user/markj/netdump/sys/arm/arm/exception.S
  user/markj/netdump/sys/arm/arm/fusu.S
  user/markj/netdump/sys/arm/arm/gic_acpi.c
  user/markj/netdump/sys/arm/arm/hypervisor-stub.S
  user/markj/netdump/sys/arm/arm/in_cksum_arm.S
  user/markj/netdump/sys/arm/arm/locore-v4.S
  user/markj/netdump/sys/arm/arm/locore-v6.S
  user/markj/netdump/sys/arm/arm/support.S
  user/markj/netdump/sys/arm/arm/swtch-v4.S
  user/markj/netdump/sys/arm/arm/swtch-v6.S
  user/markj/netdump/sys/arm/arm/swtch.S
  user/markj/netdump/sys/arm/at91/at91_rst.c
  user/markj/netdump/sys/arm/conf/GENERIC
  user/markj/netdump/sys/arm/freescale/vybrid/vf_ccm.c
  user/markj/netdump/sys/arm/freescale/vybrid/vf_iomuxc.c
  user/markj/netdump/sys/arm/mv/mv_localbus.c
  user/markj/netdump/sys/arm/nvidia/as3722_gpio.c
  user/markj/netdump/sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c
  user/markj/netdump/sys/arm/nvidia/tegra_pinmux.c
  user/markj/netdump/sys/arm/xilinx/zy7_gpio.c
  user/markj/netdump/sys/arm64/arm64/bzero.S
  user/markj/netdump/sys/arm64/arm64/copyinout.S
  user/markj/netdump/sys/arm64/arm64/exception.S
  user/markj/netdump/sys/arm64/arm64/locore.S
  user/markj/netdump/sys/arm64/arm64/support.S
  user/markj/netdump/sys/arm64/arm64/swtch.S
  user/markj/netdump/sys/cam/scsi/scsi_all.h
  user/markj/netdump/sys/cam/scsi/scsi_da.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_removal.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zthr.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_indirect.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_removal.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zcp_synctask.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zthr.c
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  user/markj/netdump/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/dtrace/amd64/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
  user/markj/netdump/sys/cddl/dev/dtrace/arm/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/dtrace/i386/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  user/markj/netdump/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/dtrace/riscv/dtrace_asm.S
  user/markj/netdump/sys/cddl/dev/fbt/x86/fbt_isa.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_ioctl.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_ioctl.h
  user/markj/netdump/sys/compat/freebsd32/freebsd32_misc.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_syscall.h
  user/markj/netdump/sys/compat/freebsd32/freebsd32_syscalls.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_sysent.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/markj/netdump/sys/compat/freebsd32/syscalls.master
  user/markj/netdump/sys/compat/linux/linux_emul.h
  user/markj/netdump/sys/compat/linux/linux_errno.c
  user/markj/netdump/sys/compat/linux/linux_ioctl.h
  user/markj/netdump/sys/compat/linux/linux_ipc.h
  user/markj/netdump/sys/compat/linux/linux_mib.h
  user/markj/netdump/sys/compat/linux/linux_misc.h
  user/markj/netdump/sys/compat/linux/linux_signal.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/asm/byteorder.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/bitops.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/cdev.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/compiler.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/device.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/dma-attrs.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/dma-mapping.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/err.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/errno.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/etherdevice.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/fs.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/idr.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/if_ether.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/if_vlan.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/io.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/jiffies.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/kernel.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/kmod.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/kobject.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/ktime.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/list.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/log2.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/miscdevice.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/module.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/mutex.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/pci.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/rwlock.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/rwsem.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/slab.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/spinlock.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/sysfs.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/usb.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/workqueue.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/net/if_inet6.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/net/ipv6.h
  user/markj/netdump/sys/compat/linuxkpi/common/include/net/netevent.h
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_compat.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_idr.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_pci.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_radix.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_rcu.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_schedule.c
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_usb.c
  user/markj/netdump/sys/conf/NOTES
  user/markj/netdump/sys/conf/dtb.mk
  user/markj/netdump/sys/conf/files
  user/markj/netdump/sys/conf/files.amd64
  user/markj/netdump/sys/conf/files.i386
  user/markj/netdump/sys/conf/files.powerpc
  user/markj/netdump/sys/conf/kern.post.mk
  user/markj/netdump/sys/conf/kmod.mk
  user/markj/netdump/sys/conf/options
  user/markj/netdump/sys/contrib/ck/FREEBSD-Xlist
  user/markj/netdump/sys/contrib/ck/include/ck_cc.h
  user/markj/netdump/sys/contrib/ck/include/ck_hs.h
  user/markj/netdump/sys/contrib/ck/include/ck_md.h
  user/markj/netdump/sys/contrib/ck/include/ck_pr.h
  user/markj/netdump/sys/contrib/ck/include/ck_queue.h
  user/markj/netdump/sys/contrib/ck/include/ck_ring.h
  user/markj/netdump/sys/contrib/ck/include/gcc/ck_cc.h
  user/markj/netdump/sys/contrib/ck/include/gcc/ck_pr.h
  user/markj/netdump/sys/contrib/ck/include/gcc/sparcv9/ck_pr.h
  user/markj/netdump/sys/contrib/ck/include/gcc/x86/ck_pr.h
  user/markj/netdump/sys/contrib/ck/include/gcc/x86_64/ck_pr.h
  user/markj/netdump/sys/contrib/ck/include/spinlock/dec.h
  user/markj/netdump/sys/contrib/ck/src/ck_hs.c
  user/markj/netdump/sys/contrib/ck/src/ck_ht.c
  user/markj/netdump/sys/contrib/ck/src/ck_ht_hash.h
  user/markj/netdump/sys/contrib/ck/src/ck_internal.h
  user/markj/netdump/sys/contrib/ck/src/ck_rhs.c
  user/markj/netdump/sys/contrib/rdma/krping/krping.c
  user/markj/netdump/sys/contrib/zstd/Makefile
  user/markj/netdump/sys/contrib/zstd/NEWS
  user/markj/netdump/sys/contrib/zstd/README.md
  user/markj/netdump/sys/contrib/zstd/appveyor.yml
  user/markj/netdump/sys/contrib/zstd/contrib/gen_html/Makefile
  user/markj/netdump/sys/contrib/zstd/contrib/meson/meson.build
  user/markj/netdump/sys/contrib/zstd/contrib/meson/meson_options.txt
  user/markj/netdump/sys/contrib/zstd/contrib/seekable_format/zstdseek_compress.c
  user/markj/netdump/sys/contrib/zstd/contrib/seekable_format/zstdseek_decompress.c
  user/markj/netdump/sys/contrib/zstd/doc/README.md
  user/markj/netdump/sys/contrib/zstd/doc/images/dict-cr.png
  user/markj/netdump/sys/contrib/zstd/doc/images/dict-cs.png
  user/markj/netdump/sys/contrib/zstd/doc/images/dict-ds.png
  user/markj/netdump/sys/contrib/zstd/doc/zstd_compression_format.md
  user/markj/netdump/sys/contrib/zstd/doc/zstd_manual.html
  user/markj/netdump/sys/contrib/zstd/lib/BUCK
  user/markj/netdump/sys/contrib/zstd/lib/README.md
  user/markj/netdump/sys/contrib/zstd/lib/common/bitstream.h
  user/markj/netdump/sys/contrib/zstd/lib/common/compiler.h
  user/markj/netdump/sys/contrib/zstd/lib/common/error_private.c
  user/markj/netdump/sys/contrib/zstd/lib/common/fse.h
  user/markj/netdump/sys/contrib/zstd/lib/common/fse_decompress.c
  user/markj/netdump/sys/contrib/zstd/lib/common/huf.h
  user/markj/netdump/sys/contrib/zstd/lib/common/pool.c
  user/markj/netdump/sys/contrib/zstd/lib/common/pool.h
  user/markj/netdump/sys/contrib/zstd/lib/common/threading.h
  user/markj/netdump/sys/contrib/zstd/lib/common/zstd_errors.h
  user/markj/netdump/sys/contrib/zstd/lib/common/zstd_internal.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/fse_compress.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/huf_compress.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_compress.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_compress_internal.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_double_fast.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_double_fast.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_fast.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_fast.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_lazy.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_lazy.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_ldm.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_ldm.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_opt.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstd_opt.h
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstdmt_compress.c
  user/markj/netdump/sys/contrib/zstd/lib/compress/zstdmt_compress.h
  user/markj/netdump/sys/contrib/zstd/lib/decompress/huf_decompress.c
  user/markj/netdump/sys/contrib/zstd/lib/decompress/zstd_decompress.c
  user/markj/netdump/sys/contrib/zstd/lib/dictBuilder/cover.c
  user/markj/netdump/sys/contrib/zstd/lib/dictBuilder/zdict.c
  user/markj/netdump/sys/contrib/zstd/lib/dictBuilder/zdict.h
  user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_legacy.h
  user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v04.c
  user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v06.c
  user/markj/netdump/sys/contrib/zstd/lib/legacy/zstd_v07.c
  user/markj/netdump/sys/contrib/zstd/lib/zstd.h
  user/markj/netdump/sys/contrib/zstd/programs/Makefile
  user/markj/netdump/sys/contrib/zstd/programs/README.md
  user/markj/netdump/sys/contrib/zstd/programs/bench.c
  user/markj/netdump/sys/contrib/zstd/programs/bench.h
  user/markj/netdump/sys/contrib/zstd/programs/fileio.c
  user/markj/netdump/sys/contrib/zstd/programs/fileio.h
  user/markj/netdump/sys/contrib/zstd/programs/platform.h
  user/markj/netdump/sys/contrib/zstd/programs/util.h
  user/markj/netdump/sys/contrib/zstd/programs/zstd.1
  user/markj/netdump/sys/contrib/zstd/programs/zstd.1.md
  user/markj/netdump/sys/contrib/zstd/programs/zstdcli.c
  user/markj/netdump/sys/contrib/zstd/tests/.gitignore
  user/markj/netdump/sys/contrib/zstd/tests/Makefile
  user/markj/netdump/sys/contrib/zstd/tests/fullbench.c
  user/markj/netdump/sys/contrib/zstd/tests/fuzz/zstd_helpers.c
  user/markj/netdump/sys/contrib/zstd/tests/fuzzer.c
  user/markj/netdump/sys/contrib/zstd/tests/legacy.c
  user/markj/netdump/sys/contrib/zstd/tests/paramgrill.c
  user/markj/netdump/sys/contrib/zstd/tests/playTests.sh
  user/markj/netdump/sys/contrib/zstd/tests/roundTripCrash.c
  user/markj/netdump/sys/contrib/zstd/tests/zstreamtest.c
  user/markj/netdump/sys/contrib/zstd/zlibWrapper/examples/zwrapbench.c
  user/markj/netdump/sys/crypto/ccp/ccp.c
  user/markj/netdump/sys/dev/adlink/adlink.c
  user/markj/netdump/sys/dev/an/if_an.c
  user/markj/netdump/sys/dev/ath/if_ath_ioctl.c
  user/markj/netdump/sys/dev/bhnd/bcma/bcma_erom.c
  user/markj/netdump/sys/dev/bhnd/bhnd.h
  user/markj/netdump/sys/dev/bhnd/bhnd_erom.c
  user/markj/netdump/sys/dev/bhnd/bhnd_erom.h
  user/markj/netdump/sys/dev/bhnd/bhnd_eromvar.h
  user/markj/netdump/sys/dev/bhnd/bhnd_subr.c
  user/markj/netdump/sys/dev/bhnd/bhndb/bhndb.c
  user/markj/netdump/sys/dev/bhnd/bhndb/bhndb_pci.c
  user/markj/netdump/sys/dev/bhnd/nvram/bhnd_nvram_private.h
  user/markj/netdump/sys/dev/bhnd/siba/siba_erom.c
  user/markj/netdump/sys/dev/cardbus/cardbus.c
  user/markj/netdump/sys/dev/ciss/ciss.c
  user/markj/netdump/sys/dev/cm/if_cm_isa.c
  user/markj/netdump/sys/dev/cxgbe/adapter.h
  user/markj/netdump/sys/dev/cxgbe/common/common.h
  user/markj/netdump/sys/dev/cxgbe/common/t4_hw.c
  user/markj/netdump/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
  user/markj/netdump/sys/dev/cxgbe/t4_main.c
  user/markj/netdump/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/markj/netdump/sys/dev/cxgbe/tom/t4_ddp.c
  user/markj/netdump/sys/dev/cxgbe/tom/t4_tls.c
  user/markj/netdump/sys/dev/cxgbe/tom/t4_tom.c
  user/markj/netdump/sys/dev/cxgbe/tom/t4_tom.h
  user/markj/netdump/sys/dev/de/if_de.c
  user/markj/netdump/sys/dev/de/if_devar.h
  user/markj/netdump/sys/dev/drm/drm_bufs.c
  user/markj/netdump/sys/dev/drm/drm_irq.c
  user/markj/netdump/sys/dev/e1000/em_txrx.c
  user/markj/netdump/sys/dev/e1000/if_em.c
  user/markj/netdump/sys/dev/e1000/if_em.h
  user/markj/netdump/sys/dev/ed/if_ed_pci.c
  user/markj/netdump/sys/dev/efidev/efidev.c
  user/markj/netdump/sys/dev/efidev/efirt.c   (contents, props changed)
  user/markj/netdump/sys/dev/ex/if_ex.c
  user/markj/netdump/sys/dev/fdt/fdt_common.c
  user/markj/netdump/sys/dev/fdt/fdt_common.h
  user/markj/netdump/sys/dev/fdt/fdt_pinctrl.c
  user/markj/netdump/sys/dev/firewire/fwohci_pci.c
  user/markj/netdump/sys/dev/firewire/fwohcireg.h
  user/markj/netdump/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S
  user/markj/netdump/sys/dev/hyperv/vmbus/hyperv.c
  user/markj/netdump/sys/dev/hyperv/vmbus/i386/vmbus_vector.S
  user/markj/netdump/sys/dev/if_ndis/if_ndis.c
  user/markj/netdump/sys/dev/iwi/if_iwi.c
  user/markj/netdump/sys/dev/iwm/if_iwm.c
  user/markj/netdump/sys/dev/iwm/if_iwm_7000.c
  user/markj/netdump/sys/dev/iwm/if_iwm_config.h
  user/markj/netdump/sys/dev/ixgb/if_ixgb.c
  user/markj/netdump/sys/dev/ixl/ixl_pf_main.c
  user/markj/netdump/sys/dev/jedec_dimm/jedec_dimm.c
  user/markj/netdump/sys/dev/md/md.c
  user/markj/netdump/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  user/markj/netdump/sys/dev/mlx5/device.h
  user/markj/netdump/sys/dev/mlx5/driver.h
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_core.h
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fw.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_health.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_main.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
  user/markj/netdump/sys/dev/mlx5/mlx5_en/en.h
  user/markj/netdump/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ifc.h
  user/markj/netdump/sys/dev/mpr/mpr_sas.c
  user/markj/netdump/sys/dev/mps/mps_sas.c
  user/markj/netdump/sys/dev/mwl/if_mwl.c
  user/markj/netdump/sys/dev/nxge/if_nxge.c
  user/markj/netdump/sys/dev/oce/oce_if.c
  user/markj/netdump/sys/dev/pccard/pccard.c
  user/markj/netdump/sys/dev/pccbb/pccbb.c
  user/markj/netdump/sys/dev/pci/pci_user.c
  user/markj/netdump/sys/dev/pdq/if_fpa.c
  user/markj/netdump/sys/dev/qlnx/qlnxe/qlnx_os.c
  user/markj/netdump/sys/dev/qlxgbe/ql_dbg.h
  user/markj/netdump/sys/dev/qlxgbe/ql_hw.c
  user/markj/netdump/sys/dev/qlxgbe/ql_ioctl.c
  user/markj/netdump/sys/dev/qlxgbe/ql_isr.c
  user/markj/netdump/sys/dev/qlxgbe/ql_os.c
  user/markj/netdump/sys/dev/qlxgbe/ql_ver.h
  user/markj/netdump/sys/dev/sbni/if_sbni.c
  user/markj/netdump/sys/dev/sfxge/sfxge.c
  user/markj/netdump/sys/dev/usb/controller/musb_otg.c
  user/markj/netdump/sys/dev/usb/controller/musb_otg.h
  user/markj/netdump/sys/dev/usb/input/ukbd.c
  user/markj/netdump/sys/dev/usb/input/wsp.c
  user/markj/netdump/sys/dev/vxge/vxge.c
  user/markj/netdump/sys/dev/xl/if_xl.c
  user/markj/netdump/sys/dts/Makefile.inc
  user/markj/netdump/sys/geom/journal/g_journal_ufs.c
  user/markj/netdump/sys/geom/label/g_label_ufs.c
  user/markj/netdump/sys/i386/acpica/acpi_wakecode.S
  user/markj/netdump/sys/i386/i386/apic_vector.s
  user/markj/netdump/sys/i386/i386/atpic_vector.s
  user/markj/netdump/sys/i386/i386/bioscall.s
  user/markj/netdump/sys/i386/i386/exception.s
  user/markj/netdump/sys/i386/i386/locore.s
  user/markj/netdump/sys/i386/i386/machdep.c
  user/markj/netdump/sys/i386/i386/mpboot.s
  user/markj/netdump/sys/i386/i386/sigtramp.s
  user/markj/netdump/sys/i386/i386/support.s
  user/markj/netdump/sys/i386/i386/swtch.s
  user/markj/netdump/sys/i386/i386/trap.c
  user/markj/netdump/sys/i386/i386/vm86.c
  user/markj/netdump/sys/i386/i386/vm86bios.s
  user/markj/netdump/sys/i386/i386/vm_machdep.c
  user/markj/netdump/sys/i386/ibcs2/ibcs2_ipc.c
  user/markj/netdump/sys/i386/ibcs2/ibcs2_misc.c
  user/markj/netdump/sys/i386/include/intr_machdep.h
  user/markj/netdump/sys/i386/linux/linux_locore.s
  user/markj/netdump/sys/i386/linux/linux_machdep.c
  user/markj/netdump/sys/i386/linux/linux_support.s
  user/markj/netdump/sys/i386/linux/linux_sysvec.c
  user/markj/netdump/sys/kern/init_main.c
  user/markj/netdump/sys/kern/init_sysent.c
  user/markj/netdump/sys/kern/kern_cpuset.c
  user/markj/netdump/sys/kern/kern_descrip.c
  user/markj/netdump/sys/kern/kern_jail.c
  user/markj/netdump/sys/kern/kern_kthread.c
  user/markj/netdump/sys/kern/kern_lock.c
  user/markj/netdump/sys/kern/kern_mutex.c
  user/markj/netdump/sys/kern/kern_ntptime.c
  user/markj/netdump/sys/kern/kern_shutdown.c
  user/markj/netdump/sys/kern/kern_sig.c
  user/markj/netdump/sys/kern/kern_thread.c
  user/markj/netdump/sys/kern/subr_sleepqueue.c
  user/markj/netdump/sys/kern/subr_trap.c
  user/markj/netdump/sys/kern/subr_witness.c
  user/markj/netdump/sys/kern/syscalls.c
  user/markj/netdump/sys/kern/syscalls.master
  user/markj/netdump/sys/kern/systrace_args.c
  user/markj/netdump/sys/kern/sysv_shm.c
  user/markj/netdump/sys/kern/tty_pts.c
  user/markj/netdump/sys/kern/uipc_syscalls.c
  user/markj/netdump/sys/kern/vfs_bio.c
  user/markj/netdump/sys/kern/vfs_mount.c
  user/markj/netdump/sys/kern/vfs_mountroot.c
  user/markj/netdump/sys/kern/vfs_subr.c
  user/markj/netdump/sys/kern/vfs_vnops.c
  user/markj/netdump/sys/mips/broadcom/bhnd_nexus.c
  user/markj/netdump/sys/mips/cavium/octeon_cop2.S
  user/markj/netdump/sys/mips/include/elf.h
  user/markj/netdump/sys/mips/ingenic/jz4780_mpboot.S
  user/markj/netdump/sys/mips/mips/exception.S
  user/markj/netdump/sys/mips/mips/fp.S
  user/markj/netdump/sys/mips/mips/locore.S
  user/markj/netdump/sys/mips/mips/mpboot.S
  user/markj/netdump/sys/mips/mips/octeon_cop2_swtch.S
  user/markj/netdump/sys/mips/mips/stdatomic.c
  user/markj/netdump/sys/mips/mips/support.S
  user/markj/netdump/sys/mips/mips/swtch.S
  user/markj/netdump/sys/mips/nlm/mpreset.S
  user/markj/netdump/sys/modules/Makefile
  user/markj/netdump/sys/modules/crypto/Makefile
  user/markj/netdump/sys/modules/dtrace/dtrace/Makefile
  user/markj/netdump/sys/modules/hyperv/vmbus/Makefile
  user/markj/netdump/sys/modules/i2c/iicbus/Makefile
  user/markj/netdump/sys/modules/i2c/isl/Makefile
  user/markj/netdump/sys/modules/iwmfw/Makefile
  user/markj/netdump/sys/modules/linux/Makefile
  user/markj/netdump/sys/modules/linux64/Makefile
  user/markj/netdump/sys/modules/linux_common/Makefile
  user/markj/netdump/sys/modules/mlx5/Makefile
  user/markj/netdump/sys/modules/sgx/Makefile
  user/markj/netdump/sys/modules/spi/at45d/Makefile
  user/markj/netdump/sys/modules/spi/mx25l/Makefile
  user/markj/netdump/sys/modules/spi/spibus/Makefile
  user/markj/netdump/sys/modules/vmware/Makefile
  user/markj/netdump/sys/net/bpf.c
  user/markj/netdump/sys/net/bpfdesc.h
  user/markj/netdump/sys/net/ethernet.h
  user/markj/netdump/sys/net/if.c
  user/markj/netdump/sys/net/if.h
  user/markj/netdump/sys/net/if_arcsubr.c
  user/markj/netdump/sys/net/if_bridge.c
  user/markj/netdump/sys/net/if_enc.c
  user/markj/netdump/sys/net/if_ethersubr.c
  user/markj/netdump/sys/net/if_fddisubr.c
  user/markj/netdump/sys/net/if_fwsubr.c
  user/markj/netdump/sys/net/if_gif.c
  user/markj/netdump/sys/net/if_gre.c
  user/markj/netdump/sys/net/if_ipsec.c
  user/markj/netdump/sys/net/if_spppsubr.c
  user/markj/netdump/sys/net/if_var.h
  user/markj/netdump/sys/net/if_vlan.c
  user/markj/netdump/sys/net/if_vlan_var.h
  user/markj/netdump/sys/net/iflib.c
  user/markj/netdump/sys/net/pfil.c
  user/markj/netdump/sys/net/pfil.h
  user/markj/netdump/sys/net/pfvar.h
  user/markj/netdump/sys/net80211/ieee80211_ioctl.c
  user/markj/netdump/sys/netinet/cc/cc.h
  user/markj/netdump/sys/netinet/cc/cc_cubic.c
  user/markj/netdump/sys/netinet/cc/cc_cubic.h
  user/markj/netdump/sys/netinet/in_pcb.c
  user/markj/netdump/sys/netinet/ip_carp.c
  user/markj/netdump/sys/netinet/ip_fastfwd.c
  user/markj/netdump/sys/netinet/ip_input.c
  user/markj/netdump/sys/netinet/ip_output.c
  user/markj/netdump/sys/netinet/tcp.h
  user/markj/netdump/sys/netinet/tcp_input.c
  user/markj/netdump/sys/netinet/tcp_offload.c
  user/markj/netdump/sys/netinet/tcp_offload.h
  user/markj/netdump/sys/netinet/tcp_output.c
  user/markj/netdump/sys/netinet/tcp_seq.h
  user/markj/netdump/sys/netinet/tcp_subr.c
  user/markj/netdump/sys/netinet/tcp_timer.c
  user/markj/netdump/sys/netinet/tcp_timewait.c
  user/markj/netdump/sys/netinet/tcp_usrreq.c
  user/markj/netdump/sys/netinet/tcp_var.h
  user/markj/netdump/sys/netinet/toecore.c
  user/markj/netdump/sys/netinet/toecore.h
  user/markj/netdump/sys/netinet6/dest6.c
  user/markj/netdump/sys/netinet6/icmp6.c
  user/markj/netdump/sys/netinet6/in6.c
  user/markj/netdump/sys/netinet6/in6_ifattach.c
  user/markj/netdump/sys/netinet6/in6_pcb.c
  user/markj/netdump/sys/netinet6/ip6_fastfwd.c
  user/markj/netdump/sys/netinet6/ip6_forward.c
  user/markj/netdump/sys/netinet6/ip6_input.c
  user/markj/netdump/sys/netinet6/ip6_output.c
  user/markj/netdump/sys/netinet6/nd6.c
  user/markj/netdump/sys/netinet6/nd6_nbr.c
  user/markj/netdump/sys/netinet6/udp6_usrreq.c
  user/markj/netdump/sys/netipsec/xform.h
  user/markj/netdump/sys/netipsec/xform_ah.c
  user/markj/netdump/sys/netipsec/xform_esp.c
  user/markj/netdump/sys/netipsec/xform_ipcomp.c
  user/markj/netdump/sys/netpfil/pf/if_pfsync.c
  user/markj/netdump/sys/netpfil/pf/pf.c
  user/markj/netdump/sys/netpfil/pf/pf.h
  user/markj/netdump/sys/netpfil/pf/pf_ioctl.c
  user/markj/netdump/sys/nfs/bootp_subr.c
  user/markj/netdump/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  user/markj/netdump/sys/opencrypto/crypto.c
  user/markj/netdump/sys/opencrypto/cryptodev.c
  user/markj/netdump/sys/opencrypto/cryptodev.h
  user/markj/netdump/sys/opencrypto/cryptosoft.c
  user/markj/netdump/sys/opencrypto/xform_auth.h
  user/markj/netdump/sys/opencrypto/xform_enc.h
  user/markj/netdump/sys/powerpc/aim/locore32.S
  user/markj/netdump/sys/powerpc/aim/locore64.S
  user/markj/netdump/sys/powerpc/booke/locore.S
  user/markj/netdump/sys/powerpc/booke/pmap.c
  user/markj/netdump/sys/powerpc/include/vmparam.h
  user/markj/netdump/sys/powerpc/powerpc/cpu_subr64.S
  user/markj/netdump/sys/powerpc/powerpc/sigcode32.S
  user/markj/netdump/sys/powerpc/powerpc/sigcode64.S
  user/markj/netdump/sys/powerpc/powerpc/swtch32.S
  user/markj/netdump/sys/powerpc/powerpc/swtch64.S
  user/markj/netdump/sys/powerpc/powerpc/trap.c
  user/markj/netdump/sys/riscv/riscv/copyinout.S
  user/markj/netdump/sys/riscv/riscv/exception.S
  user/markj/netdump/sys/riscv/riscv/locore.S
  user/markj/netdump/sys/riscv/riscv/support.S
  user/markj/netdump/sys/riscv/riscv/swtch.S
  user/markj/netdump/sys/security/mac/mac_net.c
  user/markj/netdump/sys/sparc64/pci/psycho.c
  user/markj/netdump/sys/sparc64/sbus/sbus.c
  user/markj/netdump/sys/sparc64/sparc64/exception.S
  user/markj/netdump/sys/sparc64/sparc64/interrupt.S
  user/markj/netdump/sys/sparc64/sparc64/locore.S
  user/markj/netdump/sys/sparc64/sparc64/mp_exception.S
  user/markj/netdump/sys/sparc64/sparc64/mp_locore.S
  user/markj/netdump/sys/sparc64/sparc64/support.S
  user/markj/netdump/sys/sparc64/sparc64/swtch.S
  user/markj/netdump/sys/sys/_bitset.h
  user/markj/netdump/sys/sys/_stdarg.h
  user/markj/netdump/sys/sys/cdefs.h
  user/markj/netdump/sys/sys/cpuset.h
  user/markj/netdump/sys/sys/domainset.h
  user/markj/netdump/sys/sys/elf_common.h
  user/markj/netdump/sys/sys/imgact.h
  user/markj/netdump/sys/sys/kernel.h
  user/markj/netdump/sys/sys/ktr_class.h
  user/markj/netdump/sys/sys/linker_set.h
  user/markj/netdump/sys/sys/lock.h
  user/markj/netdump/sys/sys/namei.h
  user/markj/netdump/sys/sys/priv.h
  user/markj/netdump/sys/sys/proc.h
  user/markj/netdump/sys/sys/random.h
  user/markj/netdump/sys/sys/refcount.h
  user/markj/netdump/sys/sys/seq.h
  user/markj/netdump/sys/sys/sockio.h
  user/markj/netdump/sys/sys/syscall.h
  user/markj/netdump/sys/sys/syscall.mk
  user/markj/netdump/sys/sys/syscallsubr.h
  user/markj/netdump/sys/sys/sysproto.h
  user/markj/netdump/sys/sys/uio.h
  user/markj/netdump/sys/vm/uma.h
  user/markj/netdump/sys/vm/uma_core.c
  user/markj/netdump/sys/vm/vm.h
  user/markj/netdump/sys/vm/vm_domainset.c
  user/markj/netdump/sys/vm/vm_domainset.h
  user/markj/netdump/sys/vm/vm_fault.c
  user/markj/netdump/sys/vm/vm_glue.c
  user/markj/netdump/sys/vm/vm_map.c
  user/markj/netdump/sys/vm/vm_map.h
  user/markj/netdump/sys/vm/vm_page.c
  user/markj/netdump/sys/vm/vm_pageout.c
  user/markj/netdump/sys/vm/vm_pagequeue.h
  user/markj/netdump/sys/vm/vm_phys.c
  user/markj/netdump/sys/vm/vm_phys.h
  user/markj/netdump/sys/vm/vm_reserv.c
  user/markj/netdump/sys/vm/vm_reserv.h
  user/markj/netdump/sys/vm/vnode_pager.c
  user/markj/netdump/sys/x86/include/signal.h
  user/markj/netdump/sys/x86/include/trap.h
  user/markj/netdump/sys/x86/include/x86_var.h
  user/markj/netdump/sys/x86/x86/cpu_machdep.c
  user/markj/netdump/sys/x86/x86/identcpu.c
  user/markj/netdump/sys/x86/x86/intr_machdep.c
  user/markj/netdump/sys/x86/x86/io_apic.c
  user/markj/netdump/sys/x86/x86/msi.c
  user/markj/netdump/sys/x86/x86/nexus.c
  user/markj/netdump/sys/x86/xen/xen_intr.c
  user/markj/netdump/tests/sys/cddl/zfs/bin/devname2devid.c
  user/markj/netdump/tests/sys/cddl/zfs/bin/zpool_bsd.ksh
  user/markj/netdump/tests/sys/cddl/zfs/bin/zpool_smi.ksh
  user/markj/netdump/tests/sys/cddl/zfs/include/libtest.kshlib
  user/markj/netdump/tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add.kshlib
  user/markj/netdump/tests/sys/cddl/zfs/tests/delegate/delegate_common.kshlib
  user/markj/netdump/tests/sys/cddl/zfs/tests/devices/devices_common.kshlib
  user/markj/netdump/tests/sys/cddl/zfs/tests/hotspare/hotspare_add_003_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/hotspare/hotspare_create_001_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/hotspare/hotspare_remove_002_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/interop/interop.cfg
  user/markj/netdump/tests/sys/cddl/zfs/tests/largest_pool/largest_pool.cfg
  user/markj/netdump/tests/sys/cddl/zfs/tests/slog/slog_013_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_001_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_002_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_005_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_006_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_008_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/utils_test/utils_test_009_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/xattr/xattr_004_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zones/zones_001_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_common.kshlib
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_001_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_003_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_004_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_005_neg.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_006_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/cleanup.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_001_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_002_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_003_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_004_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_005_pos.ksh
  user/markj/netdump/tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_006_pos.ksh
  user/markj/netdump/tests/sys/kern/Makefile
  user/markj/netdump/tests/sys/opencrypto/Makefile
  user/markj/netdump/tools/boot/lua-lint.sh
  user/markj/netdump/tools/tools/crypto/Makefile
  user/markj/netdump/tools/tools/crypto/cryptotest.c
  user/markj/netdump/usr.bin/calendar/calendars/calendar.freebsd
  user/markj/netdump/usr.bin/cpuset/cpuset.1
  user/markj/netdump/usr.bin/cpuset/cpuset.c
  user/markj/netdump/usr.bin/netstat/inet.c
  user/markj/netdump/usr.bin/netstat/main.c
  user/markj/netdump/usr.bin/netstat/netstat.1
  user/markj/netdump/usr.bin/netstat/netstat.h
  user/markj/netdump/usr.bin/timeout/timeout.1
  user/markj/netdump/usr.bin/truss/syscall.h
  user/markj/netdump/usr.bin/truss/syscalls.c
  user/markj/netdump/usr.sbin/arp/arp.c
  user/markj/netdump/usr.sbin/ctld/ctld.8
  user/markj/netdump/usr.sbin/makefs/cd9660.c
  user/markj/netdump/usr.sbin/makefs/cd9660/cd9660_eltorito.c
  user/markj/netdump/usr.sbin/makefs/cd9660/cd9660_eltorito.h
  user/markj/netdump/usr.sbin/makefs/ffs.c
  user/markj/netdump/usr.sbin/makefs/makefs.8
  user/markj/netdump/usr.sbin/syslogd/syslogd.c
  user/markj/netdump/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
Directory Properties:
  user/markj/netdump/   (props changed)
  user/markj/netdump/cddl/   (props changed)
  user/markj/netdump/cddl/contrib/opensolaris/   (props changed)
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/   (props changed)
  user/markj/netdump/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/markj/netdump/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/markj/netdump/contrib/llvm/   (props changed)
  user/markj/netdump/contrib/llvm/projects/libunwind/   (props changed)
  user/markj/netdump/contrib/llvm/tools/lld/   (props changed)
  user/markj/netdump/contrib/tzdata/   (props changed)
  user/markj/netdump/crypto/openssl/   (props changed)
  user/markj/netdump/sys/cddl/contrib/opensolaris/   (props changed)
  user/markj/netdump/sys/contrib/ck/   (props changed)
  user/markj/netdump/sys/contrib/zstd/   (props changed)

Modified: user/markj/netdump/Makefile.inc1
==============================================================================
--- user/markj/netdump/Makefile.inc1	Tue Apr  3 14:09:34 2018	(r331928)
+++ user/markj/netdump/Makefile.inc1	Tue Apr  3 14:29:56 2018	(r331929)
@@ -1394,6 +1394,14 @@ INSTALLKERNEL= ${_kernel}
 .endif
 .endfor
 
+_cleankernobj_fast_depend_hack: .PHONY
+# 20180320 remove stale generated assym.s after renaming to .inc in r331254
+.if exists(${OBJTOP}/sys/${KERNCONF}/assym.s)
+	@echo Removing stale generated assym files
+	@rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \
+	    ${OBJTOP}/sys/${KERNCONF}/.depend.assym.*
+.endif
+
 ${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}: .MAKE .PHONY
 
 #
@@ -1429,6 +1437,8 @@ buildkernel: .MAKE .PHONY
 	@echo ">>> stage 2.1: cleaning up the object tree"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR}
+.else
+	${_+_}cd ${.CURDIR}; ${WMAKE} _cleankernobj_fast_depend_hack
 .endif
 .if !defined(NO_KERNELOBJ)
 	@echo

Modified: user/markj/netdump/ObsoleteFiles.inc
==============================================================================
--- user/markj/netdump/ObsoleteFiles.inc	Tue Apr  3 14:09:34 2018	(r331928)
+++ user/markj/netdump/ObsoleteFiles.inc	Tue Apr  3 14:29:56 2018	(r331929)
@@ -59,7 +59,6 @@ OLD_FILES+=usr/share/openssl/man/man1/c_rehash.1.gz
 # 20180206: remove gdbtui
 OLD_FILES+=usr/bin/gdbtui
 # 20180201: Obsolete forth files
-OLD_FILES+=boot/efi.4th
 OLD_FILES+=boot/pcibios.4th
 # 20180114: new clang import which bumps version from 5.0.1 to 6.0.0.
 OLD_FILES+=usr/lib/clang/5.0.1/include/sanitizer/allocator_interface.h

Modified: user/markj/netdump/UPDATING
==============================================================================
--- user/markj/netdump/UPDATING	Tue Apr  3 14:09:34 2018	(r331928)
+++ user/markj/netdump/UPDATING	Tue Apr  3 14:29:56 2018	(r331929)
@@ -51,6 +51,22 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20180328:
+	Support for token ring networks has been removed. If you
+	have "device token" in your kernel config you should remove
+	it. No device drivers supported token ring.
+
+20180323:
+	makefs was modified to be able to tag ISO9660 El Torito boot catalog
+	entries as EFI instead of overloading the i386 tag as done previously.
+	The amd64 mkisoimages.sh script used to build amd64 ISO images for
+	release was updated to use this. This may mean that makefs must be
+	updated before "make cdrom" can be run in the release directory. This
+	should be as simple as:
+
+		$ cd $SRCDIR/usr.sbin/makefs
+		$ make depend all install
+
 20180212:
 	FreeBSD boot loader enhanced with Lua scripting. It's purely opt-in for
 	now by building WITH_LOADER_LUA and WITHOUT_FORTH in /etc/src.conf.
@@ -613,7 +629,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	rebooting, e.g.:
 
 	make buildworld
-	make kernel KERNCONF=YOUR_KERNEL_HERE
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
 	make -C sys/boot install
 	<reboot in single user>
 
@@ -1984,7 +2001,8 @@ COMMON ITEMS:
 	----------------------------------------------
 	<make sure you have good level 0 dumps>
 	make buildworld					[9]
-	make kernel KERNCONF=YOUR_KERNEL_HERE		[8]
+	make buildkernel KERNCONF=YOUR_KERNEL_HERE	[8]
+	make installkernel KERNCONF=YOUR_KERNEL_HERE
 							[1]
 	<reboot in single user>				[3]
 	mergemaster -Fp					[5]

Modified: user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Apr  3 14:09:34 2018	(r331928)
+++ user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Apr  3 14:29:56 2018	(r331929)
@@ -21,7 +21,7 @@
 .Nd display zpool debugging and consistency information
 .Sh SYNOPSIS
 .Nm
-.Op Fl AbcdDFGhiLMPsvX
+.Op Fl AbcdDFGhikLMPsvX
 .Op Fl e Oo Fl V Oc Op Fl p Ar path ...
 .Op Fl I Ar inflight I/Os
 .Oo Fl o Ar var Ns = Ns Ar value Oc Ns ...
@@ -170,6 +170,9 @@ Display information about intent log
 .Pq ZIL
 entries relating to each dataset.
 If specified multiple times, display counts of each intent log transaction type.
+.It Fl k
+Examine the checkpointed state of the pool.
+Note, the on disk format of the pool is not reverted to the checkpointed state.
 .It Fl l Ar device
 Read the vdev labels from the specified device.
 .Nm Fl l

Modified: user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Apr  3 14:09:34 2018	(r331928)
+++ user/markj/netdump/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Apr  3 14:29:56 2018	(r331929)
@@ -24,6 +24,7 @@
  * Copyright (c) 2011, 2017 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  * Copyright 2017 Nexenta Systems, Inc.
+ * Copyright 2017 RackTop Systems.
  */
 
 #include <stdio.h>
@@ -88,12 +89,14 @@ extern boolean_t zfs_recover;
 extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
 extern int zfs_vdev_async_read_max_active;
 extern boolean_t spa_load_verify_dryrun;
+extern int aok;
 #else
 int reference_tracking_enable;
 boolean_t zfs_recover;
 uint64_t zfs_arc_max, zfs_arc_meta_limit;
 int zfs_vdev_async_read_max_active;
 boolean_t spa_load_verify_dryrun;
+int aok;
 #endif
 
 static const char cmdname[] = "zdb";
@@ -128,7 +131,7 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "Usage:\t%s [-AbcdDFGhiLMPsvX] [-e [-V] [-p <path> ...]] "
+	    "Usage:\t%s [-AbcdDFGhikLMPsvX] [-e [-V] [-p <path> ...]] "
 	    "[-I <inflight I/Os>]\n"
 	    "\t\t[-o <var>=<value>]... [-t <txg>] [-U <cache>] [-x <dumpdir>]\n"
 	    "\t\t[<poolname> [<object> ...]]\n"
@@ -165,6 +168,8 @@ usage(void)
 	(void) fprintf(stderr, "        -h pool history\n");
 	(void) fprintf(stderr, "        -i intent logs\n");
 	(void) fprintf(stderr, "        -l read label contents\n");
+	(void) fprintf(stderr, "        -k examine the checkpointed state "
+	    "of the pool\n");
 	(void) fprintf(stderr, "        -L disable leak tracking (do not "
 	    "load spacemaps)\n");
 	(void) fprintf(stderr, "        -m metaslabs\n");
@@ -726,6 +731,22 @@ get_prev_obsolete_spacemap_refcount(spa_t *spa)
 }
 
 static int
+get_checkpoint_refcount(vdev_t *vd)
+{
+	int refcount = 0;
+
+	if (vd->vdev_top == vd && vd->vdev_top_zap != 0 &&
+	    zap_contains(spa_meta_objset(vd->vdev_spa),
+	    vd->vdev_top_zap, VDEV_TOP_ZAP_POOL_CHECKPOINT_SM) == 0)
+		refcount++;
+
+	for (uint64_t c = 0; c < vd->vdev_children; c++)
+		refcount += get_checkpoint_refcount(vd->vdev_child[c]);
+
+	return (refcount);
+}
+
+static int
 verify_spacemap_refcounts(spa_t *spa)
 {
 	uint64_t expected_refcount = 0;
@@ -738,6 +759,7 @@ verify_spacemap_refcounts(spa_t *spa)
 	actual_refcount += get_metaslab_refcount(spa->spa_root_vdev);
 	actual_refcount += get_obsolete_refcount(spa->spa_root_vdev);
 	actual_refcount += get_prev_obsolete_spacemap_refcount(spa);
+	actual_refcount += get_checkpoint_refcount(spa->spa_root_vdev);
 
 	if (expected_refcount != actual_refcount) {
 		(void) printf("space map refcount mismatch: expected %lld != "
@@ -811,8 +833,8 @@ static void
 dump_metaslab_stats(metaslab_t *msp)
 {
 	char maxbuf[32];
-	range_tree_t *rt = msp->ms_tree;
-	avl_tree_t *t = &msp->ms_size_tree;
+	range_tree_t *rt = msp->ms_allocatable;
+	avl_tree_t *t = &msp->ms_allocatable_by_size;
 	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
 	/* max sure nicenum has enough space */
@@ -848,7 +870,7 @@ dump_metaslab(metaslab_t *msp)
 		metaslab_load_wait(msp);
 		if (!msp->ms_loaded) {
 			VERIFY0(metaslab_load(msp));
-			range_tree_stat_verify(msp->ms_tree);
+			range_tree_stat_verify(msp->ms_allocatable);
 		}
 		dump_metaslab_stats(msp);
 		metaslab_unload(msp);
@@ -2286,6 +2308,8 @@ dump_uberblock(uberblock_t *ub, const char *header, co
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), &ub->ub_rootbp);
 		(void) printf("\trootbp = %s\n", blkbuf);
 	}
+	(void) printf("\tcheckpoint_txg = %llu\n",
+	    (u_longlong_t)ub->ub_checkpoint_txg);
 	(void) printf("%s", footer ? footer : "");
 }
 
@@ -2646,6 +2670,7 @@ static const char *zdb_ot_extname[] = {
 typedef struct zdb_cb {
 	zdb_blkstats_t	zcb_type[ZB_TOTAL + 1][ZDB_OT_TOTAL + 1];
 	uint64_t	zcb_removing_size;
+	uint64_t	zcb_checkpoint_size;
 	uint64_t	zcb_dedup_asize;
 	uint64_t	zcb_dedup_blocks;
 	uint64_t	zcb_embedded_blocks[NUM_BP_EMBEDDED_TYPES];
@@ -2745,7 +2770,7 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *zilog, const b
 	}
 
 	VERIFY3U(zio_wait(zio_claim(NULL, zcb->zcb_spa,
-	    refcnt ? 0 : spa_first_txg(zcb->zcb_spa),
+	    refcnt ? 0 : spa_min_claim_txg(zcb->zcb_spa),
 	    bp, NULL, NULL, ZIO_FLAG_CANFAIL)), ==, 0);
 }
 
@@ -2947,7 +2972,7 @@ claim_segment_impl_cb(uint64_t inner_offset, vdev_t *v
 	ASSERT(vdev_is_concrete(vd));
 
 	VERIFY0(metaslab_claim_impl(vd, offset, size,
-	    spa_first_txg(vd->vdev_spa)));
+	    spa_min_claim_txg(vd->vdev_spa)));
 }
 
 static void
@@ -3008,70 +3033,6 @@ zdb_claim_removing(spa_t *spa, zdb_cb_t *zcb)
 	spa_config_exit(spa, SCL_CONFIG, FTAG);
 }
 
-/*
- * vm_idxp is an in-out parameter which (for indirect vdevs) is the
- * index in vim_entries that has the first entry in this metaslab.  On
- * return, it will be set to the first entry after this metaslab.
- */
-static void
-zdb_leak_init_ms(metaslab_t *msp, uint64_t *vim_idxp)
-{
-	metaslab_group_t *mg = msp->ms_group;
-	vdev_t *vd = mg->mg_vd;
-	vdev_t *rvd = vd->vdev_spa->spa_root_vdev;
-
-	mutex_enter(&msp->ms_lock);
-	metaslab_unload(msp);
-
-	/*
-	 * We don't want to spend the CPU manipulating the size-ordered
-	 * tree, so clear the range_tree ops.
-	 */
-	msp->ms_tree->rt_ops = NULL;
-
-	(void) fprintf(stderr,
-	    "\rloading vdev %llu of %llu, metaslab %llu of %llu ...",
-	    (longlong_t)vd->vdev_id,
-	    (longlong_t)rvd->vdev_children,
-	    (longlong_t)msp->ms_id,
-	    (longlong_t)vd->vdev_ms_count);
-
-	/*
-	 * For leak detection, we overload the metaslab ms_tree to
-	 * contain allocated segments instead of free segments. As a
-	 * result, we can't use the normal metaslab_load/unload
-	 * interfaces.
-	 */
-	if (vd->vdev_ops == &vdev_indirect_ops) {
-		vdev_indirect_mapping_t *vim = vd->vdev_indirect_mapping;
-		for (; *vim_idxp < vdev_indirect_mapping_num_entries(vim);
-		    (*vim_idxp)++) {
-			vdev_indirect_mapping_entry_phys_t *vimep =
-			    &vim->vim_entries[*vim_idxp];
-			uint64_t ent_offset = DVA_MAPPING_GET_SRC_OFFSET(vimep);
-			uint64_t ent_len = DVA_GET_ASIZE(&vimep->vimep_dst);
-			ASSERT3U(ent_offset, >=, msp->ms_start);
-			if (ent_offset >= msp->ms_start + msp->ms_size)
-				break;
-
-			/*
-			 * Mappings do not cross metaslab boundaries,
-			 * because we create them by walking the metaslabs.
-			 */
-			ASSERT3U(ent_offset + ent_len, <=,
-			    msp->ms_start + msp->ms_size);
-			range_tree_add(msp->ms_tree, ent_offset, ent_len);
-		}
-	} else if (msp->ms_sm != NULL) {
-		VERIFY0(space_map_load(msp->ms_sm, msp->ms_tree, SM_ALLOC));
-	}
-
-	if (!msp->ms_loaded) {
-		msp->ms_loaded = B_TRUE;
-	}
-	mutex_exit(&msp->ms_lock);
-}
-
 /* ARGSUSED */
 static int
 increment_indirect_mapping_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
@@ -3128,7 +3089,243 @@ zdb_load_obsolete_counts(vdev_t *vd)
 	return (counts);
 }
 
+typedef struct checkpoint_sm_exclude_entry_arg {
+	vdev_t *cseea_vd;
+	uint64_t cseea_checkpoint_size;
+} checkpoint_sm_exclude_entry_arg_t;
+
+static int
+checkpoint_sm_exclude_entry_cb(maptype_t type, uint64_t offset, uint64_t size,
+    void *arg)
+{
+	checkpoint_sm_exclude_entry_arg_t *cseea = arg;
+	vdev_t *vd = cseea->cseea_vd;
+	metaslab_t *ms = vd->vdev_ms[offset >> vd->vdev_ms_shift];
+	uint64_t end = offset + size;
+
+	ASSERT(type == SM_FREE);
+
+	/*
+	 * Since the vdev_checkpoint_sm exists in the vdev level
+	 * and the ms_sm space maps exist in the metaslab level,
+	 * an entry in the checkpoint space map could theoretically
+	 * cross the boundaries of the metaslab that it belongs.
+	 *
+	 * In reality, because of the way that we populate and
+	 * manipulate the checkpoint's space maps currently,
+	 * there shouldn't be any entries that cross metaslabs.
+	 * Hence the assertion below.
+	 *
+	 * That said, there is no fundamental requirement that
+	 * the checkpoint's space map entries should not cross
+	 * metaslab boundaries. So if needed we could add code
+	 * that handles metaslab-crossing segments in the future.
+	 */
+	VERIFY3U(offset, >=, ms->ms_start);
+	VERIFY3U(end, <=, ms->ms_start + ms->ms_size);
+
+	/*
+	 * By removing the entry from the allocated segments we
+	 * also verify that the entry is there to begin with.
+	 */
+	mutex_enter(&ms->ms_lock);
+	range_tree_remove(ms->ms_allocatable, offset, size);
+	mutex_exit(&ms->ms_lock);
+
+	cseea->cseea_checkpoint_size += size;
+	return (0);
+}
+
 static void
+zdb_leak_init_vdev_exclude_checkpoint(vdev_t *vd, zdb_cb_t *zcb)
+{
+	spa_t *spa = vd->vdev_spa;
+	space_map_t *checkpoint_sm = NULL;
+	uint64_t checkpoint_sm_obj;
+
+	/*
+	 * If there is no vdev_top_zap, we are in a pool whose
+	 * version predates the pool checkpoint feature.
+	 */
+	if (vd->vdev_top_zap == 0)
+		return;
+
+	/*
+	 * If there is no reference of the vdev_checkpoint_sm in
+	 * the vdev_top_zap, then one of the following scenarios
+	 * is true:
+	 *
+	 * 1] There is no checkpoint
+	 * 2] There is a checkpoint, but no checkpointed blocks
+	 *    have been freed yet
+	 * 3] The current vdev is indirect
+	 *
+	 * In these cases we return immediately.
+	 */
+	if (zap_contains(spa_meta_objset(spa), vd->vdev_top_zap,
+	    VDEV_TOP_ZAP_POOL_CHECKPOINT_SM) != 0)
+		return;
+
+	VERIFY0(zap_lookup(spa_meta_objset(spa), vd->vdev_top_zap,
+	    VDEV_TOP_ZAP_POOL_CHECKPOINT_SM, sizeof (uint64_t), 1,
+	    &checkpoint_sm_obj));
+
+	checkpoint_sm_exclude_entry_arg_t cseea;
+	cseea.cseea_vd = vd;
+	cseea.cseea_checkpoint_size = 0;
+
+	VERIFY0(space_map_open(&checkpoint_sm, spa_meta_objset(spa),
+	    checkpoint_sm_obj, 0, vd->vdev_asize, vd->vdev_ashift));
+	space_map_update(checkpoint_sm);
+
+	VERIFY0(space_map_iterate(checkpoint_sm,
+	    checkpoint_sm_exclude_entry_cb, &cseea));
+	space_map_close(checkpoint_sm);
+
+	zcb->zcb_checkpoint_size += cseea.cseea_checkpoint_size;
+}
+
+static void
+zdb_leak_init_exclude_checkpoint(spa_t *spa, zdb_cb_t *zcb)
+{
+	vdev_t *rvd = spa->spa_root_vdev;
+	for (uint64_t c = 0; c < rvd->vdev_children; c++) {
+		ASSERT3U(c, ==, rvd->vdev_child[c]->vdev_id);
+		zdb_leak_init_vdev_exclude_checkpoint(rvd->vdev_child[c], zcb);
+	}
+}
+
+static void
+load_concrete_ms_allocatable_trees(spa_t *spa, maptype_t maptype)
+{
+	vdev_t *rvd = spa->spa_root_vdev;
+	for (uint64_t i = 0; i < rvd->vdev_children; i++) {
+		vdev_t *vd = rvd->vdev_child[i];
+
+		ASSERT3U(i, ==, vd->vdev_id);
+
+		if (vd->vdev_ops == &vdev_indirect_ops)
+			continue;
+
+		for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
+			metaslab_t *msp = vd->vdev_ms[m];
+
+			(void) fprintf(stderr,
+			    "\rloading concrete vdev %llu, "
+			    "metaslab %llu of %llu ...",
+			    (longlong_t)vd->vdev_id,
+			    (longlong_t)msp->ms_id,
+			    (longlong_t)vd->vdev_ms_count);
+
+			mutex_enter(&msp->ms_lock);
+			metaslab_unload(msp);
+
+			/*
+			 * We don't want to spend the CPU manipulating the
+			 * size-ordered tree, so clear the range_tree ops.
+			 */
+			msp->ms_allocatable->rt_ops = NULL;
+
+			if (msp->ms_sm != NULL) {
+				VERIFY0(space_map_load(msp->ms_sm,
+				    msp->ms_allocatable, maptype));
+			}
+			if (!msp->ms_loaded)
+				msp->ms_loaded = B_TRUE;
+			mutex_exit(&msp->ms_lock);
+		}
+	}
+}
+
+/*
+ * vm_idxp is an in-out parameter which (for indirect vdevs) is the
+ * index in vim_entries that has the first entry in this metaslab.
+ * On return, it will be set to the first entry after this metaslab.
+ */
+static void
+load_indirect_ms_allocatable_tree(vdev_t *vd, metaslab_t *msp,
+    uint64_t *vim_idxp)
+{
+	vdev_indirect_mapping_t *vim = vd->vdev_indirect_mapping;
+
+	mutex_enter(&msp->ms_lock);
+	metaslab_unload(msp);
+
+	/*
+	 * We don't want to spend the CPU manipulating the
+	 * size-ordered tree, so clear the range_tree ops.
+	 */
+	msp->ms_allocatable->rt_ops = NULL;
+
+	for (; *vim_idxp < vdev_indirect_mapping_num_entries(vim);
+	    (*vim_idxp)++) {
+		vdev_indirect_mapping_entry_phys_t *vimep =
+		    &vim->vim_entries[*vim_idxp];
+		uint64_t ent_offset = DVA_MAPPING_GET_SRC_OFFSET(vimep);
+		uint64_t ent_len = DVA_GET_ASIZE(&vimep->vimep_dst);
+		ASSERT3U(ent_offset, >=, msp->ms_start);
+		if (ent_offset >= msp->ms_start + msp->ms_size)
+			break;
+
+		/*
+		 * Mappings do not cross metaslab boundaries,
+		 * because we create them by walking the metaslabs.
+		 */
+		ASSERT3U(ent_offset + ent_len, <=,
+		    msp->ms_start + msp->ms_size);
+		range_tree_add(msp->ms_allocatable, ent_offset, ent_len);
+	}
+
+	if (!msp->ms_loaded)
+		msp->ms_loaded = B_TRUE;
+	mutex_exit(&msp->ms_lock);
+}
+
+static void
+zdb_leak_init_prepare_indirect_vdevs(spa_t *spa, zdb_cb_t *zcb)
+{
+	vdev_t *rvd = spa->spa_root_vdev;
+	for (uint64_t c = 0; c < rvd->vdev_children; c++) {
+		vdev_t *vd = rvd->vdev_child[c];
+
+		ASSERT3U(c, ==, vd->vdev_id);
+
+		if (vd->vdev_ops != &vdev_indirect_ops)
+			continue;
+
+		/*
+		 * Note: we don't check for mapping leaks on
+		 * removing vdevs because their ms_allocatable's
+		 * are used to look for leaks in allocated space.
+		 */
+		zcb->zcb_vd_obsolete_counts[c] = zdb_load_obsolete_counts(vd);
+
+		/*
+		 * Normally, indirect vdevs don't have any
+		 * metaslabs.  We want to set them up for
+		 * zio_claim().
+		 */
+		VERIFY0(vdev_metaslab_init(vd, 0));
+
+		vdev_indirect_mapping_t *vim = vd->vdev_indirect_mapping;
+		uint64_t vim_idx = 0;
+		for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
+
+			(void) fprintf(stderr,
+			    "\rloading indirect vdev %llu, "
+			    "metaslab %llu of %llu ...",
+			    (longlong_t)vd->vdev_id,
+			    (longlong_t)vd->vdev_ms[m]->ms_id,
+			    (longlong_t)vd->vdev_ms_count);
+
+			load_indirect_ms_allocatable_tree(vd, vd->vdev_ms[m],
+			    &vim_idx);
+		}
+		ASSERT3U(vim_idx, ==, vdev_indirect_mapping_num_entries(vim));
+	}
+}
+
+static void
 zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 {
 	zcb->zcb_spa = spa;
@@ -3139,7 +3336,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 
 		/*
 		 * We are going to be changing the meaning of the metaslab's
-		 * ms_tree.  Ensure that the allocator doesn't try to
+		 * ms_allocatable.  Ensure that the allocator doesn't try to
 		 * use the tree.
 		 */
 		spa->spa_normal_class->mc_ops = &zdb_metaslab_ops;
@@ -3149,39 +3346,37 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 		    umem_zalloc(rvd->vdev_children * sizeof (uint32_t *),
 		    UMEM_NOFAIL);
 
+		/*
+		 * For leak detection, we overload the ms_allocatable trees
+		 * to contain allocated segments instead of free segments.
+		 * As a result, we can't use the normal metaslab_load/unload
+		 * interfaces.
+		 */
+		zdb_leak_init_prepare_indirect_vdevs(spa, zcb);
+		load_concrete_ms_allocatable_trees(spa, SM_ALLOC);
 
-		for (uint64_t c = 0; c < rvd->vdev_children; c++) {
-			vdev_t *vd = rvd->vdev_child[c];
-			uint64_t vim_idx = 0;
+		/*
+		 * On load_concrete_ms_allocatable_trees() we loaded all the
+		 * allocated entries from the ms_sm to the ms_allocatable for
+		 * each metaslab. If the pool has a checkpoint or is in the
+		 * middle of discarding a checkpoint, some of these blocks
+		 * may have been freed but their ms_sm may not have been
+		 * updated because they are referenced by the checkpoint. In
+		 * order to avoid false-positives during leak-detection, we
+		 * go through the vdev's checkpoint space map and exclude all
+		 * its entries from their relevant ms_allocatable.
+		 *
+		 * We also aggregate the space held by the checkpoint and add
+		 * it to zcb_checkpoint_size.
+		 *
+		 * Note that at this point we are also verifying that all the
+		 * entries on the checkpoint_sm are marked as allocated in
+		 * the ms_sm of their relevant metaslab.
+		 * [see comment in checkpoint_sm_exclude_entry_cb()]
+		 */
+		zdb_leak_init_exclude_checkpoint(spa, zcb);
 
-			ASSERT3U(c, ==, vd->vdev_id);
-
-			/*
-			 * Note: we don't check for mapping leaks on
-			 * removing vdevs because their ms_tree's are
-			 * used to look for leaks in allocated space.
-			 */
-			if (vd->vdev_ops == &vdev_indirect_ops) {
-				zcb->zcb_vd_obsolete_counts[c] =
-				    zdb_load_obsolete_counts(vd);
-
-				/*
-				 * Normally, indirect vdevs don't have any
-				 * metaslabs.  We want to set them up for
-				 * zio_claim().
-				 */
-				VERIFY0(vdev_metaslab_init(vd, 0));
-			}
-
-			for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
-				zdb_leak_init_ms(vd->vdev_ms[m], &vim_idx);
-			}
-			if (vd->vdev_ops == &vdev_indirect_ops) {
-				ASSERT3U(vim_idx, ==,
-				    vdev_indirect_mapping_num_entries(
-				    vd->vdev_indirect_mapping));
-			}
-		}
+		/* for cleaner progress output */
 		(void) fprintf(stderr, "\n");
 
 		if (bpobj_is_open(&dp->dp_obsolete_bpobj)) {
@@ -3190,12 +3385,16 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 			(void) bpobj_iterate_nofree(&dp->dp_obsolete_bpobj,
 			    increment_indirect_mapping_cb, zcb, NULL);
 		}
+	} else {
+		/*
+		 * If leak tracing is disabled, we still need to consider
+		 * any checkpointed space in our space verification.
+		 */
+		zcb->zcb_checkpoint_size += spa_get_checkpoint_space(spa);
 	}
 
 	spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
-
 	zdb_ddt_leak_init(spa, zcb);
-
 	spa_config_exit(spa, SCL_CONFIG, FTAG);
 }
 
@@ -3222,7 +3421,7 @@ zdb_check_for_obsolete_leaks(vdev_t *vd, zdb_cb_t *zcb
 		for (uint64_t inner_offset = 0;
 		    inner_offset < DVA_GET_ASIZE(&vimep->vimep_dst);
 		    inner_offset += 1 << vd->vdev_ashift) {
-			if (range_tree_contains(msp->ms_tree,
+			if (range_tree_contains(msp->ms_allocatable,
 			    offset + inner_offset, 1 << vd->vdev_ashift)) {
 				obsolete_bytes += 1 << vd->vdev_ashift;
 			}
@@ -3288,23 +3487,23 @@ zdb_leak_fini(spa_t *spa, zdb_cb_t *zcb)
 				ASSERT3P(mg, ==, msp->ms_group);
 
 				/*
-				 * The ms_tree has been overloaded to
-				 * contain allocated segments. Now that we
-				 * finished traversing all blocks, any
-				 * block that remains in the ms_tree
+				 * ms_allocatable has been overloaded
+				 * to contain allocated segments. Now that
+				 * we finished traversing all blocks, any
+				 * block that remains in the ms_allocatable
 				 * represents an allocated block that we
 				 * did not claim during the traversal.
 				 * Claimed blocks would have been removed
-				 * from the ms_tree.  For indirect vdevs,
-				 * space remaining in the tree represents
-				 * parts of the mapping that are not
-				 * referenced, which is not a bug.
+				 * from the ms_allocatable.  For indirect
+				 * vdevs, space remaining in the tree
+				 * represents parts of the mapping that are
+				 * not referenced, which is not a bug.
 				 */
 				if (vd->vdev_ops == &vdev_indirect_ops) {
-					range_tree_vacate(msp->ms_tree,
+					range_tree_vacate(msp->ms_allocatable,
 					    NULL, NULL);
 				} else {
-					range_tree_vacate(msp->ms_tree,
+					range_tree_vacate(msp->ms_allocatable,
 					    zdb_leak, vd);
 				}
 
@@ -3427,7 +3626,7 @@ dump_block_stats(spa_t *spa)
 
 	total_alloc = norm_alloc + metaslab_class_get_alloc(spa_log_class(spa));
 	total_found = tzb->zb_asize - zcb.zcb_dedup_asize +
-	    zcb.zcb_removing_size;
+	    zcb.zcb_removing_size + zcb.zcb_checkpoint_size;
 
 	if (total_found == total_alloc) {
 		if (!dump_opt['L'])
@@ -3836,7 +4035,385 @@ verify_device_removal_feature_counts(spa_t *spa)
 	return (ret);
 }
 
+#define	BOGUS_SUFFIX "_CHECKPOINTED_UNIVERSE"
+/*
+ * Import the checkpointed state of the pool specified by the target
+ * parameter as readonly. The function also accepts a pool config
+ * as an optional parameter, else it attempts to infer the config by
+ * the name of the target pool.
+ *
+ * Note that the checkpointed state's pool name will be the name of
+ * the original pool with the above suffix appened to it. In addition,
+ * if the target is not a pool name (e.g. a path to a dataset) then
+ * the new_path parameter is populated with the updated path to
+ * reflect the fact that we are looking into the checkpointed state.
+ *
+ * The function returns a newly-allocated copy of the name of the
+ * pool containing the checkpointed state. When this copy is no
+ * longer needed it should be freed with free(3C). Same thing
+ * applies to the new_path parameter if allocated.
+ */
+static char *
+import_checkpointed_state(char *target, nvlist_t *cfg, char **new_path)
+{
+	int error = 0;
+	char *poolname, *bogus_name;
+
+	/* If the target is not a pool, the extract the pool name */
+	char *path_start = strchr(target, '/');
+	if (path_start != NULL) {
+		size_t poolname_len = path_start - target;
+		poolname = strndup(target, poolname_len);
+	} else {
+		poolname = target;
+	}
+
+	if (cfg == NULL) {
+		error = spa_get_stats(poolname, &cfg, NULL, 0);
+		if (error != 0) {
+			fatal("Tried to read config of pool \"%s\" but "
+			    "spa_get_stats() failed with error %d\n",
+			    poolname, error);
+		}
+	}
+
+	(void) asprintf(&bogus_name, "%s%s", poolname, BOGUS_SUFFIX);
+	fnvlist_add_string(cfg, ZPOOL_CONFIG_POOL_NAME, bogus_name);
+
+	error = spa_import(bogus_name, cfg, NULL,
+	    ZFS_IMPORT_MISSING_LOG | ZFS_IMPORT_CHECKPOINT);
+	if (error != 0) {
+		fatal("Tried to import pool \"%s\" but spa_import() failed "
+		    "with error %d\n", bogus_name, error);
+	}
+
+	if (new_path != NULL && path_start != NULL)
+		(void) asprintf(new_path, "%s%s", bogus_name, path_start);
+
+	if (target != poolname)
+		free(poolname);
+
+	return (bogus_name);
+}
+
+typedef struct verify_checkpoint_sm_entry_cb_arg {
+	vdev_t *vcsec_vd;
+
+	/* the following fields are only used for printing progress */
+	uint64_t vcsec_entryid;
+	uint64_t vcsec_num_entries;
+} verify_checkpoint_sm_entry_cb_arg_t;
+
+#define	ENTRIES_PER_PROGRESS_UPDATE 10000
+
+static int
+verify_checkpoint_sm_entry_cb(maptype_t type, uint64_t offset, uint64_t size,
+    void *arg)
+{
+	verify_checkpoint_sm_entry_cb_arg_t *vcsec = arg;
+	vdev_t *vd = vcsec->vcsec_vd;
+	metaslab_t *ms = vd->vdev_ms[offset >> vd->vdev_ms_shift];
+	uint64_t end = offset + size;
+
+	ASSERT(type == SM_FREE);
+
+	if ((vcsec->vcsec_entryid % ENTRIES_PER_PROGRESS_UPDATE) == 0) {
+		(void) fprintf(stderr,
+		    "\rverifying vdev %llu, space map entry %llu of %llu ...",
+		    (longlong_t)vd->vdev_id,
+		    (longlong_t)vcsec->vcsec_entryid,
+		    (longlong_t)vcsec->vcsec_num_entries);
+	}
+	vcsec->vcsec_entryid++;
+
+	/*
+	 * See comment in checkpoint_sm_exclude_entry_cb()
+	 */
+	VERIFY3U(offset, >=, ms->ms_start);
+	VERIFY3U(end, <=, ms->ms_start + ms->ms_size);
+
+	/*
+	 * The entries in the vdev_checkpoint_sm should be marked as
+	 * allocated in the checkpointed state of the pool, therefore
+	 * their respective ms_allocateable trees should not contain them.
+	 */
+	mutex_enter(&ms->ms_lock);
+	range_tree_verify(ms->ms_allocatable, offset, size);
+	mutex_exit(&ms->ms_lock);
+
+	return (0);
+}
+
+/*
+ * Verify that all segments in the vdev_checkpoint_sm are allocated
+ * according to the checkpoint's ms_sm (i.e. are not in the checkpoint's
+ * ms_allocatable).
+ *
+ * Do so by comparing the checkpoint space maps (vdev_checkpoint_sm) of
+ * each vdev in the current state of the pool to the metaslab space maps
+ * (ms_sm) of the checkpointed state of the pool.
+ *
+ * Note that the function changes the state of the ms_allocatable
+ * trees of the current spa_t. The entries of these ms_allocatable
+ * trees are cleared out and then repopulated from with the free
+ * entries of their respective ms_sm space maps.
+ */
 static void
+verify_checkpoint_vdev_spacemaps(spa_t *checkpoint, spa_t *current)
+{
+	vdev_t *ckpoint_rvd = checkpoint->spa_root_vdev;
+	vdev_t *current_rvd = current->spa_root_vdev;
+
+	load_concrete_ms_allocatable_trees(checkpoint, SM_FREE);
+
+	for (uint64_t c = 0; c < ckpoint_rvd->vdev_children; c++) {
+		vdev_t *ckpoint_vd = ckpoint_rvd->vdev_child[c];
+		vdev_t *current_vd = current_rvd->vdev_child[c];
+
+		space_map_t *checkpoint_sm = NULL;
+		uint64_t checkpoint_sm_obj;
+
+		if (ckpoint_vd->vdev_ops == &vdev_indirect_ops) {
+			/*
+			 * Since we don't allow device removal in a pool
+			 * that has a checkpoint, we expect that all removed
+			 * vdevs were removed from the pool before the
+			 * checkpoint.
+			 */
+			ASSERT3P(current_vd->vdev_ops, ==, &vdev_indirect_ops);
+			continue;
+		}
+
+		/*
+		 * If the checkpoint space map doesn't exist, then nothing
+		 * here is checkpointed so there's nothing to verify.
+		 */
+		if (current_vd->vdev_top_zap == 0 ||
+		    zap_contains(spa_meta_objset(current),
+		    current_vd->vdev_top_zap,
+		    VDEV_TOP_ZAP_POOL_CHECKPOINT_SM) != 0)
+			continue;
+
+		VERIFY0(zap_lookup(spa_meta_objset(current),
+		    current_vd->vdev_top_zap, VDEV_TOP_ZAP_POOL_CHECKPOINT_SM,
+		    sizeof (uint64_t), 1, &checkpoint_sm_obj));
+
+		VERIFY0(space_map_open(&checkpoint_sm, spa_meta_objset(current),
+		    checkpoint_sm_obj, 0, current_vd->vdev_asize,
+		    current_vd->vdev_ashift));
+		space_map_update(checkpoint_sm);
+
+		verify_checkpoint_sm_entry_cb_arg_t vcsec;
+		vcsec.vcsec_vd = ckpoint_vd;
+		vcsec.vcsec_entryid = 0;
+		vcsec.vcsec_num_entries =
+		    space_map_length(checkpoint_sm) / sizeof (uint64_t);
+		VERIFY0(space_map_iterate(checkpoint_sm,
+		    verify_checkpoint_sm_entry_cb, &vcsec));
+		dump_spacemap(current->spa_meta_objset, checkpoint_sm);
+		space_map_close(checkpoint_sm);
+	}
+
+	/*
+	 * If we've added vdevs since we took the checkpoint, ensure
+	 * that their checkpoint space maps are empty.
+	 */
+	if (ckpoint_rvd->vdev_children < current_rvd->vdev_children) {
+		for (uint64_t c = ckpoint_rvd->vdev_children;
+		    c < current_rvd->vdev_children; c++) {
+			vdev_t *current_vd = current_rvd->vdev_child[c];
+			ASSERT3P(current_vd->vdev_checkpoint_sm, ==, NULL);
+		}
+	}
+
+	/* for cleaner progress output */
+	(void) fprintf(stderr, "\n");
+}
+
+/*
+ * Verifies that all space that's allocated in the checkpoint is
+ * still allocated in the current version, by checking that everything
+ * in checkpoint's ms_allocatable (which is actually allocated, not
+ * allocatable/free) is not present in current's ms_allocatable.
+ *
+ * Note that the function changes the state of the ms_allocatable
+ * trees of both spas when called. The entries of all ms_allocatable
+ * trees are cleared out and then repopulated from their respective
+ * ms_sm space maps. In the checkpointed state we load the allocated
+ * entries, and in the current state we load the free entries.
+ */
+static void
+verify_checkpoint_ms_spacemaps(spa_t *checkpoint, spa_t *current)
+{
+	vdev_t *ckpoint_rvd = checkpoint->spa_root_vdev;
+	vdev_t *current_rvd = current->spa_root_vdev;
+
+	load_concrete_ms_allocatable_trees(checkpoint, SM_ALLOC);
+	load_concrete_ms_allocatable_trees(current, SM_FREE);
+
+	for (uint64_t i = 0; i < ckpoint_rvd->vdev_children; i++) {
+		vdev_t *ckpoint_vd = ckpoint_rvd->vdev_child[i];
+		vdev_t *current_vd = current_rvd->vdev_child[i];
+
+		if (ckpoint_vd->vdev_ops == &vdev_indirect_ops) {
+			/*
+			 * See comment in verify_checkpoint_vdev_spacemaps()
+			 */
+			ASSERT3P(current_vd->vdev_ops, ==, &vdev_indirect_ops);
+			continue;
+		}
+
+		for (uint64_t m = 0; m < ckpoint_vd->vdev_ms_count; m++) {
+			metaslab_t *ckpoint_msp = ckpoint_vd->vdev_ms[m];
+			metaslab_t *current_msp = current_vd->vdev_ms[m];
+
+			(void) fprintf(stderr,
+			    "\rverifying vdev %llu of %llu, "
+			    "metaslab %llu of %llu ...",
+			    (longlong_t)current_vd->vdev_id,
+			    (longlong_t)current_rvd->vdev_children,
+			    (longlong_t)current_vd->vdev_ms[m]->ms_id,
+			    (longlong_t)current_vd->vdev_ms_count);
+
+			/*
+			 * We walk through the ms_allocatable trees that
+			 * are loaded with the allocated blocks from the
+			 * ms_sm spacemaps of the checkpoint. For each
+			 * one of these ranges we ensure that none of them
+			 * exists in the ms_allocatable trees of the
+			 * current state which are loaded with the ranges
+			 * that are currently free.
+			 *
+			 * This way we ensure that none of the blocks that
+			 * are part of the checkpoint were freed by mistake.
+			 */
+			range_tree_walk(ckpoint_msp->ms_allocatable,
+			    (range_tree_func_t *)range_tree_verify,
+			    current_msp->ms_allocatable);
+		}
+	}
+
+	/* for cleaner progress output */
+	(void) fprintf(stderr, "\n");
+}
+
+static void
+verify_checkpoint_blocks(spa_t *spa)
+{
+	spa_t *checkpoint_spa;
+	char *checkpoint_pool;
+	nvlist_t *config = NULL;
+	int error = 0;
+
+	/*
+	 * We import the checkpointed state of the pool (under a different
+	 * name) so we can do verification on it against the current state
+	 * of the pool.
+	 */
+	checkpoint_pool = import_checkpointed_state(spa->spa_name, config,
+	    NULL);
+	ASSERT(strcmp(spa->spa_name, checkpoint_pool) != 0);
+
+	error = spa_open(checkpoint_pool, &checkpoint_spa, FTAG);
+	if (error != 0) {
+		fatal("Tried to open pool \"%s\" but spa_open() failed with "
+		    "error %d\n", checkpoint_pool, error);
+	}
+
+	/*
+	 * Ensure that ranges in the checkpoint space maps of each vdev
+	 * are allocated according to the checkpointed state's metaslab
+	 * space maps.
+	 */
+	verify_checkpoint_vdev_spacemaps(checkpoint_spa, spa);
+
+	/*
+	 * Ensure that allocated ranges in the checkpoint's metaslab
+	 * space maps remain allocated in the metaslab space maps of
+	 * the current state.
+	 */
+	verify_checkpoint_ms_spacemaps(checkpoint_spa, spa);
+
+	/*
+	 * Once we are done, we get rid of the checkpointed state.

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