svn commit: r323335 - in projects/krb5: . bin/chflags bin/chflags/tests bin/dd bin/mkdir bin/mkdir/tests bin/pkill bin/ps bin/rcp bin/rcp/tests bin/rmdir bin/rmdir/tests cddl/compat/opensolaris/mis...

Fri Sep 8 22:04:33 UTC 2017

Author: cy
Date: Fri Sep  8 22:04:28 2017
New Revision: 323335
URL: https://svnweb.freebsd.org/changeset/base/323335

Log:
  Catch up on (MFH) r320793 through r323334 from head.

Added:
  projects/krb5/bin/chflags/tests/
     - copied from r323334, head/bin/chflags/tests/
  projects/krb5/bin/mkdir/tests/
     - copied from r323334, head/bin/mkdir/tests/
  projects/krb5/bin/rcp/tests/
     - copied from r323334, head/bin/rcp/tests/
  projects/krb5/bin/rmdir/tests/
     - copied from r323334, head/bin/rmdir/tests/
  projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d
     - copied unchanged from r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d
  projects/krb5/cddl/lib/libdtrace/socket.d
     - copied unchanged from r323334, head/cddl/lib/libdtrace/socket.d
  projects/krb5/contrib/zstd/lib/common/compiler.h
     - copied unchanged from r323334, head/contrib/zstd/lib/common/compiler.h
  projects/krb5/contrib/zstd/tests/files/
     - copied from r323334, head/contrib/zstd/tests/files/
  projects/krb5/contrib/zstd/tests/fuzz/
     - copied from r323334, head/contrib/zstd/tests/fuzz/
  projects/krb5/contrib/zstd/tests/poolTests.c
     - copied unchanged from r323334, head/contrib/zstd/tests/poolTests.c
  projects/krb5/lib/clang/Makefile.inc
     - copied unchanged from r323334, head/lib/clang/Makefile.inc
  projects/krb5/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c
     - copied unchanged from r323334, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.c
  projects/krb5/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h
     - copied unchanged from r323334, head/lib/libc/amd64/sys/amd64_detect_rdfsgsbase.h
  projects/krb5/lib/libc/tests/gen/getmntinfo_test.c
     - copied unchanged from r323334, head/lib/libc/tests/gen/getmntinfo_test.c
  projects/krb5/share/man/man4/amdsmn.4
     - copied unchanged from r323334, head/share/man/man4/amdsmn.4
  projects/krb5/share/man/man4/mlx5ib.4
     - copied unchanged from r323334, head/share/man/man4/mlx5ib.4
  projects/krb5/share/man/man4/ntb.4
     - copied unchanged from r323334, head/share/man/man4/ntb.4
  projects/krb5/share/man/man4/ntb_hw_intel.4
     - copied unchanged from r323334, head/share/man/man4/ntb_hw_intel.4
  projects/krb5/share/man/man4/ntb_hw_plx.4
     - copied unchanged from r323334, head/share/man/man4/ntb_hw_plx.4
  projects/krb5/sys/arm/mv/armada38x/armada38x_rtc.c
     - copied unchanged from r323334, head/sys/arm/mv/armada38x/armada38x_rtc.c
  projects/krb5/sys/boot/efi/loader/efi_main.c
     - copied unchanged from r323334, head/sys/boot/efi/loader/efi_main.c
  projects/krb5/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c
     - copied unchanged from r323334, head/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c
  projects/krb5/sys/dev/amdsmn/
     - copied from r323334, head/sys/dev/amdsmn/
  projects/krb5/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu
     - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t4fw-1.16.59.0.bin.uu
  projects/krb5/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
     - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
  projects/krb5/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
     - copied unchanged from r323334, head/sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
  projects/krb5/sys/dev/mlx5/mlx5_ib/
     - copied from r323334, head/sys/dev/mlx5/mlx5_ib/
  projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
     - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
  projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_intel.h
     - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_intel.h
  projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
     - copied unchanged from r323334, head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
  projects/krb5/sys/modules/amdsmn/
     - copied from r323334, head/sys/modules/amdsmn/
  projects/krb5/sys/modules/mlx5ib/
     - copied from r323334, head/sys/modules/mlx5ib/
  projects/krb5/sys/modules/ntb/ntb_hw_intel/
     - copied from r323334, head/sys/modules/ntb/ntb_hw_intel/
  projects/krb5/sys/modules/ntb/ntb_hw_plx/
     - copied from r323334, head/sys/modules/ntb/ntb_hw_plx/
  projects/krb5/usr.sbin/efivar/efiutil.c
     - copied unchanged from r323334, head/usr.sbin/efivar/efiutil.c
  projects/krb5/usr.sbin/efivar/efiutil.h
     - copied unchanged from r323334, head/usr.sbin/efivar/efiutil.h
Deleted:
  projects/krb5/contrib/zstd/PATENTS
  projects/krb5/contrib/zstd/tests/pool.c
  projects/krb5/share/man/man4/ntb_hw.4
  projects/krb5/sys/arm/mv/armada38x/rtc.c
  projects/krb5/sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu
  projects/krb5/sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu
  projects/krb5/sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
  projects/krb5/sys/dev/ntb/ntb_hw/ntb_hw.c
  projects/krb5/sys/dev/ntb/ntb_hw/ntb_regs.h
  projects/krb5/sys/modules/ntb/ntb_hw/
Modified:
  projects/krb5/Makefile.inc1
  projects/krb5/UPDATING
  projects/krb5/bin/chflags/Makefile
  projects/krb5/bin/dd/args.c
  projects/krb5/bin/dd/conv.c
  projects/krb5/bin/dd/dd.c
  projects/krb5/bin/dd/dd.h
  projects/krb5/bin/dd/position.c
  projects/krb5/bin/mkdir/Makefile
  projects/krb5/bin/pkill/pkill.c
  projects/krb5/bin/ps/print.c
  projects/krb5/bin/ps/ps.1
  projects/krb5/bin/rcp/Makefile
  projects/krb5/bin/rmdir/Makefile
  projects/krb5/cddl/compat/opensolaris/misc/zmount.c
  projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/krb5/cddl/lib/libdtrace/Makefile
  projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
  projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc
  projects/krb5/contrib/binutils/opcodes/i386-dis.c
  projects/krb5/contrib/binutils/opcodes/i386-opc.h
  projects/krb5/contrib/binutils/opcodes/i386-opc.tbl
  projects/krb5/contrib/binutils/opcodes/i386-tbl.h
  projects/krb5/contrib/compiler-rt/lib/builtins/arm/aeabi_dcmp.S
  projects/krb5/contrib/compiler-rt/lib/builtins/arm/aeabi_fcmp.S
  projects/krb5/contrib/compiler-rt/lib/builtins/int_lib.h
  projects/krb5/contrib/compiler-rt/lib/esan/esan_sideline_linux.cpp
  projects/krb5/contrib/compiler-rt/lib/profile/InstrProfilingNameVar.c
  projects/krb5/contrib/cortex-strings/src/aarch64/memcpy.S
  projects/krb5/contrib/file/src/readelf.c
  projects/krb5/contrib/llvm/include/llvm/CodeGen/SelectionDAGNodes.h
  projects/krb5/contrib/llvm/lib/Analysis/PostDominators.cpp
  projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
  projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.h
  projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  projects/krb5/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
  projects/krb5/contrib/llvm/lib/IR/AutoUpgrade.cpp
  projects/krb5/contrib/llvm/lib/Object/COFFModuleDefinition.cpp
  projects/krb5/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  projects/krb5/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/krb5/contrib/llvm/lib/Target/X86/X86InstrAVX512.td
  projects/krb5/contrib/llvm/lib/Target/X86/X86SchedSandyBridge.td
  projects/krb5/contrib/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
  projects/krb5/contrib/llvm/lib/ToolDrivers/llvm-dlltool/Options.td
  projects/krb5/contrib/llvm/lib/Transforms/Scalar/LowerAtomic.cpp
  projects/krb5/contrib/llvm/lib/Transforms/Scalar/Reassociate.cpp
  projects/krb5/contrib/llvm/lib/Transforms/Utils/CloneFunction.cpp
  projects/krb5/contrib/llvm/tools/clang/include/clang/AST/DeclCXX.h
  projects/krb5/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  projects/krb5/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.def
  projects/krb5/contrib/llvm/tools/clang/include/clang/Frontend/CodeGenOptions.h
  projects/krb5/contrib/llvm/tools/clang/include/clang/Lex/Preprocessor.h
  projects/krb5/contrib/llvm/tools/clang/lib/AST/ASTImporter.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/AST/DeclCXX.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/ABIInfo.h
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CGCXXABI.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CGDebugInfo.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenFunction.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/CodeGenTypes.h
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/ItaniumCXXABI.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/MicrosoftCXXABI.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/Clang.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/Darwin.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Driver/ToolChains/MSVC.h
  projects/krb5/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Format/WhitespaceManager.h
  projects/krb5/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Headers/unwind.h
  projects/krb5/contrib/llvm/tools/clang/lib/Lex/PPLexerChange.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Lex/Preprocessor.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Parse/Parser.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Sema/SemaDeclCXX.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Sema/SemaObjCProperty.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTReaderDecl.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/Serialization/ASTWriter.cpp
  projects/krb5/contrib/llvm/tools/clang/lib/StaticAnalyzer/Core/RegionStore.cpp
  projects/krb5/contrib/llvm/tools/lldb/source/Host/common/TCPSocket.cpp
  projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLinux_i386.cpp
  projects/krb5/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContext_x86.h
  projects/krb5/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/krb5/contrib/top/loadavg.h
  projects/krb5/contrib/unbound/validator/autotrust.c
  projects/krb5/contrib/zstd/CONTRIBUTING.md
  projects/krb5/contrib/zstd/Makefile
  projects/krb5/contrib/zstd/NEWS
  projects/krb5/contrib/zstd/README.md
  projects/krb5/contrib/zstd/circle.yml
  projects/krb5/contrib/zstd/doc/educational_decoder/harness.c
  projects/krb5/contrib/zstd/doc/educational_decoder/zstd_decompress.c
  projects/krb5/contrib/zstd/doc/educational_decoder/zstd_decompress.h
  projects/krb5/contrib/zstd/doc/zstd_compression_format.md
  projects/krb5/contrib/zstd/doc/zstd_manual.html
  projects/krb5/contrib/zstd/lib/common/bitstream.h
  projects/krb5/contrib/zstd/lib/common/error_private.c
  projects/krb5/contrib/zstd/lib/common/error_private.h
  projects/krb5/contrib/zstd/lib/common/fse.h
  projects/krb5/contrib/zstd/lib/common/fse_decompress.c
  projects/krb5/contrib/zstd/lib/common/huf.h
  projects/krb5/contrib/zstd/lib/common/mem.h
  projects/krb5/contrib/zstd/lib/common/pool.c
  projects/krb5/contrib/zstd/lib/common/pool.h
  projects/krb5/contrib/zstd/lib/common/threading.h
  projects/krb5/contrib/zstd/lib/common/xxhash.c
  projects/krb5/contrib/zstd/lib/common/zstd_common.c
  projects/krb5/contrib/zstd/lib/common/zstd_errors.h
  projects/krb5/contrib/zstd/lib/common/zstd_internal.h
  projects/krb5/contrib/zstd/lib/compress/fse_compress.c
  projects/krb5/contrib/zstd/lib/compress/huf_compress.c
  projects/krb5/contrib/zstd/lib/compress/zstd_compress.c
  projects/krb5/contrib/zstd/lib/compress/zstd_opt.h
  projects/krb5/contrib/zstd/lib/compress/zstdmt_compress.c
  projects/krb5/contrib/zstd/lib/compress/zstdmt_compress.h
  projects/krb5/contrib/zstd/lib/decompress/huf_decompress.c
  projects/krb5/contrib/zstd/lib/decompress/zstd_decompress.c
  projects/krb5/contrib/zstd/lib/deprecated/zbuff.h
  projects/krb5/contrib/zstd/lib/deprecated/zbuff_common.c
  projects/krb5/contrib/zstd/lib/deprecated/zbuff_compress.c
  projects/krb5/contrib/zstd/lib/deprecated/zbuff_decompress.c
  projects/krb5/contrib/zstd/lib/dictBuilder/cover.c
  projects/krb5/contrib/zstd/lib/dictBuilder/zdict.c
  projects/krb5/contrib/zstd/lib/dictBuilder/zdict.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_legacy.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v01.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v01.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v02.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v02.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v03.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v03.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v04.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v04.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v05.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v05.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v06.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v06.h
  projects/krb5/contrib/zstd/lib/legacy/zstd_v07.c
  projects/krb5/contrib/zstd/lib/legacy/zstd_v07.h
  projects/krb5/contrib/zstd/lib/zstd.h
  projects/krb5/contrib/zstd/programs/.gitignore
  projects/krb5/contrib/zstd/programs/Makefile
  projects/krb5/contrib/zstd/programs/README.md
  projects/krb5/contrib/zstd/programs/bench.c
  projects/krb5/contrib/zstd/programs/bench.h
  projects/krb5/contrib/zstd/programs/datagen.c
  projects/krb5/contrib/zstd/programs/datagen.h
  projects/krb5/contrib/zstd/programs/dibio.c
  projects/krb5/contrib/zstd/programs/dibio.h
  projects/krb5/contrib/zstd/programs/fileio.c
  projects/krb5/contrib/zstd/programs/fileio.h
  projects/krb5/contrib/zstd/programs/platform.h
  projects/krb5/contrib/zstd/programs/util.h
  projects/krb5/contrib/zstd/programs/zstd.1
  projects/krb5/contrib/zstd/programs/zstd.1.md
  projects/krb5/contrib/zstd/programs/zstdcli.c
  projects/krb5/contrib/zstd/tests/Makefile
  projects/krb5/contrib/zstd/tests/datagencli.c
  projects/krb5/contrib/zstd/tests/decodecorpus.c
  projects/krb5/contrib/zstd/tests/fullbench.c
  projects/krb5/contrib/zstd/tests/fuzzer.c
  projects/krb5/contrib/zstd/tests/invalidDictionaries.c
  projects/krb5/contrib/zstd/tests/legacy.c
  projects/krb5/contrib/zstd/tests/longmatch.c
  projects/krb5/contrib/zstd/tests/namespaceTest.c
  projects/krb5/contrib/zstd/tests/paramgrill.c
  projects/krb5/contrib/zstd/tests/playTests.sh
  projects/krb5/contrib/zstd/tests/roundTripCrash.c
  projects/krb5/contrib/zstd/tests/symbols.c
  projects/krb5/contrib/zstd/tests/zbufftest.c
  projects/krb5/contrib/zstd/tests/zstreamtest.c
  projects/krb5/contrib/zstd/zlibWrapper/examples/zwrapbench.c
  projects/krb5/contrib/zstd/zlibWrapper/gzcompatibility.h
  projects/krb5/contrib/zstd/zlibWrapper/gzlib.c
  projects/krb5/contrib/zstd/zlibWrapper/gzread.c
  projects/krb5/contrib/zstd/zlibWrapper/gzwrite.c
  projects/krb5/contrib/zstd/zlibWrapper/zstd_zlibwrapper.c
  projects/krb5/contrib/zstd/zlibWrapper/zstd_zlibwrapper.h
  projects/krb5/etc/mtree/BSD.tests.dist
  projects/krb5/etc/periodic/security/100.chksetuid
  projects/krb5/etc/periodic/security/110.neggrpperm
  projects/krb5/etc/periodic/security/security.functions
  projects/krb5/lib/clang/include/clang/Basic/Version.inc
  projects/krb5/lib/clang/include/lld/Config/Version.inc
  projects/krb5/lib/clang/include/llvm/Support/VCSRevision.h
  projects/krb5/lib/csu/mips/crti.S
  projects/krb5/lib/csu/mips/crtn.S
  projects/krb5/lib/libc/amd64/sys/Makefile.inc
  projects/krb5/lib/libc/amd64/sys/amd64_get_fsbase.c
  projects/krb5/lib/libc/amd64/sys/amd64_get_gsbase.c
  projects/krb5/lib/libc/amd64/sys/amd64_set_fsbase.c
  projects/krb5/lib/libc/amd64/sys/amd64_set_gsbase.c
  projects/krb5/lib/libc/gen/fnmatch.c
  projects/krb5/lib/libc/gen/getmntinfo.c
  projects/krb5/lib/libc/locale/setlocale.c
  projects/krb5/lib/libc/locale/setrunelocale.c
  projects/krb5/lib/libc/locale/xlocale_private.h
  projects/krb5/lib/libc/mips/Symbol.map
  projects/krb5/lib/libc/tests/gen/Makefile
  projects/krb5/lib/libcompiler_rt/Makefile.inc
  projects/krb5/lib/libefivar/Makefile
  projects/krb5/lib/libefivar/efivar-dp-format.c
  projects/krb5/lib/libefivar/efivar-dp-parse.c
  projects/krb5/lib/libefivar/efivar-dp.h
  projects/krb5/lib/libgeom/geom_util.c
  projects/krb5/lib/libpmc/libpmc.c
  projects/krb5/lib/libproc/_libproc.h
  projects/krb5/lib/libproc/proc_rtld.c
  projects/krb5/lib/libproc/proc_sym.c
  projects/krb5/lib/libstand/nfs.c
  projects/krb5/lib/libsysdecode/Makefile
  projects/krb5/lib/libsysdecode/flags.c
  projects/krb5/lib/libsysdecode/mktables
  projects/krb5/lib/libsysdecode/sysdecode.h
  projects/krb5/lib/libsysdecode/sysdecode_enum.3
  projects/krb5/lib/libsysdecode/sysdecode_mask.3
  projects/krb5/lib/msun/src/catrig.c
  projects/krb5/lib/msun/src/catrigl.c
  projects/krb5/lib/msun/src/s_csqrtl.c
  projects/krb5/lib/msun/tests/csqrt_test.c
  projects/krb5/lib/msun/tests/trig_test.c
  projects/krb5/libexec/getty/gettytab.5
  projects/krb5/libexec/getty/gettytab.h
  projects/krb5/libexec/getty/init.c
  projects/krb5/libexec/getty/main.c
  projects/krb5/libexec/rtld-elf/Makefile
  projects/krb5/libexec/rtld-elf/rtld.1
  projects/krb5/libexec/rtld-elf/rtld.c
  projects/krb5/release/amd64/make-memstick.sh
  projects/krb5/release/amd64/mkisoimages.sh
  projects/krb5/release/i386/make-memstick.sh
  projects/krb5/release/i386/mkisoimages.sh
  projects/krb5/release/powerpc/make-memstick.sh
  projects/krb5/release/powerpc/mkisoimages.sh
  projects/krb5/release/sparc64/mkisoimages.sh
  projects/krb5/release/tools/ec2.conf
  projects/krb5/release/tools/gce.conf
  projects/krb5/sbin/fsck_ffs/setup.c
  projects/krb5/sbin/geom/class/eli/geli.8
  projects/krb5/sbin/geom/class/eli/geom_eli.c
  projects/krb5/sbin/geom/class/virstor/geom_virstor.c
  projects/krb5/sbin/geom/misc/subr.c
  projects/krb5/sbin/mdconfig/mdconfig.8
  projects/krb5/sbin/mdconfig/mdconfig.c
  projects/krb5/sbin/newfs/mkfs.c
  projects/krb5/sbin/nvmecontrol/identify.c
  projects/krb5/share/man/man4/Makefile
  projects/krb5/share/man/man4/amdtemp.4
  projects/krb5/share/man/man4/ddb.4
  projects/krb5/share/man/man4/hv_vss.4
  projects/krb5/share/man/man4/if_ntb.4
  projects/krb5/share/man/man4/ntb_transport.4
  projects/krb5/share/man/man4/tty.4
  projects/krb5/share/misc/committers-ports.dot
  projects/krb5/share/misc/committers-src.dot
  projects/krb5/share/misc/pci_vendors
  projects/krb5/share/mk/bsd.lib.mk
  projects/krb5/share/mk/bsd.prog.mk
  projects/krb5/share/mk/bsd.sys.mk
  projects/krb5/sys/amd64/amd64/cpu_switch.S
  projects/krb5/sys/amd64/amd64/exception.S
  projects/krb5/sys/amd64/amd64/machdep.c
  projects/krb5/sys/amd64/amd64/ptrace_machdep.c
  projects/krb5/sys/amd64/amd64/sys_machdep.c
  projects/krb5/sys/amd64/amd64/vm_machdep.c
  projects/krb5/sys/amd64/conf/GENERIC
  projects/krb5/sys/amd64/conf/NOTES
  projects/krb5/sys/amd64/include/asmacros.h
  projects/krb5/sys/amd64/include/param.h
  projects/krb5/sys/amd64/include/pcb.h
  projects/krb5/sys/amd64/vmm/intel/vmx_msr.c
  projects/krb5/sys/arm/arm/generic_timer.c
  projects/krb5/sys/arm/broadcom/bcm2835/bcm2836_mp.c
  projects/krb5/sys/arm/conf/ARMADA38X
  projects/krb5/sys/arm/mv/armada38x/files.armada38x
  projects/krb5/sys/arm64/arm64/genassym.c
  projects/krb5/sys/arm64/arm64/identcpu.c
  projects/krb5/sys/arm64/arm64/mp_machdep.c
  projects/krb5/sys/arm64/arm64/pmap.c
  projects/krb5/sys/arm64/arm64/swtch.S
  projects/krb5/sys/arm64/arm64/vm_machdep.c
  projects/krb5/sys/arm64/conf/GENERIC
  projects/krb5/sys/arm64/include/armreg.h
  projects/krb5/sys/arm64/include/cpu.h
  projects/krb5/sys/arm64/include/pcb.h
  projects/krb5/sys/arm64/include/proc.h
  projects/krb5/sys/boot/efi/boot1/Makefile
  projects/krb5/sys/boot/efi/boot1/boot1.c
  projects/krb5/sys/boot/efi/boot1/boot_module.h
  projects/krb5/sys/boot/efi/boot1/ufs_module.c
  projects/krb5/sys/boot/efi/boot1/zfs_module.c
  projects/krb5/sys/boot/efi/include/efiapi.h
  projects/krb5/sys/boot/efi/include/efichar.h
  projects/krb5/sys/boot/efi/include/efidevp.h
  projects/krb5/sys/boot/efi/include/efilib.h
  projects/krb5/sys/boot/efi/libefi/Makefile
  projects/krb5/sys/boot/efi/libefi/efichar.c
  projects/krb5/sys/boot/efi/libefi/libefi.c
  projects/krb5/sys/boot/efi/loader/Makefile
  projects/krb5/sys/boot/efi/loader/arch/amd64/Makefile.inc
  projects/krb5/sys/boot/efi/loader/arch/i386/Makefile.inc
  projects/krb5/sys/boot/efi/loader/bootinfo.c
  projects/krb5/sys/boot/efi/loader/conf.c
  projects/krb5/sys/boot/fdt/dts/arm/zedboard.dts
  projects/krb5/sys/boot/fdt/dts/arm/zybo.dts
  projects/krb5/sys/boot/forth/loader.conf
  projects/krb5/sys/boot/geli/geliboot.c
  projects/krb5/sys/boot/geli/geliboot.h
  projects/krb5/sys/boot/geli/geliboot_crypto.c
  projects/krb5/sys/boot/geli/geliboot_internal.h
  projects/krb5/sys/boot/geli/pwgets.c
  projects/krb5/sys/boot/i386/libi386/biosdisk.c
  projects/krb5/sys/boot/i386/libi386/spinconsole.c
  projects/krb5/sys/cam/ata/ata_da.c
  projects/krb5/sys/cam/cam_ccb.h
  projects/krb5/sys/cam/cam_iosched.c
  projects/krb5/sys/cam/cam_iosched.h
  projects/krb5/sys/cam/cam_xpt.c
  projects/krb5/sys/cam/nvme/nvme_all.c
  projects/krb5/sys/cam/nvme/nvme_all.h
  projects/krb5/sys/cam/nvme/nvme_da.c
  projects/krb5/sys/cam/nvme/nvme_xpt.c
  projects/krb5/sys/cam/scsi/scsi_all.c
  projects/krb5/sys/cam/scsi/scsi_da.c
  projects/krb5/sys/cam/scsi/scsi_pass.c
  projects/krb5/sys/cddl/compat/opensolaris/sys/mntent.h
  projects/krb5/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/krb5/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/krb5/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/krb5/sys/cddl/dev/dtrace/mips/dtrace_asm.S
  projects/krb5/sys/cddl/dev/dtrace/mips/dtrace_subr.c
  projects/krb5/sys/cddl/dev/fbt/mips/fbt_isa.c
  projects/krb5/sys/compat/cloudabi/cloudabi_fd.c
  projects/krb5/sys/compat/cloudabi/cloudabi_file.c
  projects/krb5/sys/compat/cloudabi/cloudabi_sock.c
  projects/krb5/sys/compat/cloudabi32/cloudabi32_proto.h
  projects/krb5/sys/compat/cloudabi32/cloudabi32_syscall.h
  projects/krb5/sys/compat/cloudabi32/cloudabi32_syscalls.c
  projects/krb5/sys/compat/cloudabi32/cloudabi32_sysent.c
  projects/krb5/sys/compat/cloudabi32/cloudabi32_systrace_args.c
  projects/krb5/sys/compat/cloudabi64/cloudabi64_proto.h
  projects/krb5/sys/compat/cloudabi64/cloudabi64_syscall.h
  projects/krb5/sys/compat/cloudabi64/cloudabi64_syscalls.c
  projects/krb5/sys/compat/cloudabi64/cloudabi64_sysent.c
  projects/krb5/sys/compat/cloudabi64/cloudabi64_systrace_args.c
  projects/krb5/sys/compat/freebsd32/freebsd32.h
  projects/krb5/sys/compat/freebsd32/freebsd32_ioctl.c
  projects/krb5/sys/compat/freebsd32/freebsd32_ioctl.h
  projects/krb5/sys/compat/freebsd32/freebsd32_misc.c
  projects/krb5/sys/compat/linuxkpi/common/include/linux/device.h
  projects/krb5/sys/compat/linuxkpi/common/include/linux/fs.h
  projects/krb5/sys/compat/linuxkpi/common/include/linux/kobject.h
  projects/krb5/sys/compat/linuxkpi/common/include/linux/lockdep.h
  projects/krb5/sys/compat/linuxkpi/common/include/linux/module.h
  projects/krb5/sys/compat/linuxkpi/common/src/linux_pci.c
  projects/krb5/sys/conf/files
  projects/krb5/sys/conf/files.amd64
  projects/krb5/sys/conf/files.arm64
  projects/krb5/sys/conf/files.i386
  projects/krb5/sys/conf/ldscript.amd64
  projects/krb5/sys/conf/newvers.sh
  projects/krb5/sys/conf/options
  projects/krb5/sys/contrib/cloudabi/cloudabi_types_common.h
  projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_aarch64.S
  projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_armv6.S
  projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_i686.S
  projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
  projects/krb5/sys/contrib/cloudabi/cloudabi_vdso_x86_64.S
  projects/krb5/sys/contrib/cloudabi/syscalls32.master
  projects/krb5/sys/contrib/cloudabi/syscalls64.master
  projects/krb5/sys/contrib/dev/acpica/changes.txt
  projects/krb5/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/krb5/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/krb5/sys/contrib/dev/acpica/compiler/asldebug.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslhelp.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslmessages.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/krb5/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslrules.y
  projects/krb5/sys/contrib/dev/acpica/compiler/asltree.c
  projects/krb5/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/krb5/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/krb5/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/krb5/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/krb5/sys/contrib/dev/acpica/compiler/dtparser.y
  projects/krb5/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/krb5/sys/contrib/dev/acpica/compiler/prparser.y
  projects/krb5/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  projects/krb5/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  projects/krb5/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  projects/krb5/sys/contrib/dev/acpica/components/events/evgpe.c
  projects/krb5/sys/contrib/dev/acpica/components/executer/exconcat.c
  projects/krb5/sys/contrib/dev/acpica/components/executer/exconvrt.c
  projects/krb5/sys/contrib/dev/acpica/components/executer/exmisc.c
  projects/krb5/sys/contrib/dev/acpica/components/executer/exresop.c
  projects/krb5/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  projects/krb5/sys/contrib/dev/acpica/components/hardware/hwregs.c
  projects/krb5/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  projects/krb5/sys/contrib/dev/acpica/components/hardware/hwxface.c
  projects/krb5/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  projects/krb5/sys/contrib/dev/acpica/components/tables/tbxface.c
  projects/krb5/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  projects/krb5/sys/contrib/dev/acpica/include/acexcep.h
  projects/krb5/sys/contrib/dev/acpica/include/achware.h
  projects/krb5/sys/contrib/dev/acpica/include/acinterp.h
  projects/krb5/sys/contrib/dev/acpica/include/acpixf.h
  projects/krb5/sys/contrib/dev/acpica/include/actbl1.h
  projects/krb5/sys/contrib/dev/acpica/include/actbl2.h
  projects/krb5/sys/contrib/dev/acpica/include/acutils.h
  projects/krb5/sys/dev/aac/aac.c
  projects/krb5/sys/dev/acpica/acpi_cpu.c
  projects/krb5/sys/dev/amdtemp/amdtemp.c
  projects/krb5/sys/dev/amr/amr.c
  projects/krb5/sys/dev/bhnd/cores/usb/bhnd_usb.c
  projects/krb5/sys/dev/bnxt/bnxt.h
  projects/krb5/sys/dev/bnxt/bnxt_hwrm.c
  projects/krb5/sys/dev/bnxt/bnxt_hwrm.h
  projects/krb5/sys/dev/bnxt/bnxt_sysctl.c
  projects/krb5/sys/dev/bnxt/bnxt_sysctl.h
  projects/krb5/sys/dev/bnxt/hsi_struct_def.h
  projects/krb5/sys/dev/bnxt/if_bnxt.c
  projects/krb5/sys/dev/cxgbe/adapter.h
  projects/krb5/sys/dev/cxgbe/common/t4_hw.c
  projects/krb5/sys/dev/cxgbe/firmware/t4fw_interface.h
  projects/krb5/sys/dev/cxgbe/firmware/t6fw_cfg.txt
  projects/krb5/sys/dev/cxgbe/iw_cxgbe/cm.c
  projects/krb5/sys/dev/cxgbe/iw_cxgbe/qp.c
  projects/krb5/sys/dev/cxgbe/offload.h
  projects/krb5/sys/dev/cxgbe/t4_main.c
  projects/krb5/sys/dev/cxgbe/t4_sge.c
  projects/krb5/sys/dev/cxgbe/tom/t4_connect.c
  projects/krb5/sys/dev/cxgbe/tom/t4_listen.c
  projects/krb5/sys/dev/cxgbe/tom/t4_tom.c
  projects/krb5/sys/dev/e1000/if_em.c
  projects/krb5/sys/dev/e1000/if_em.h
  projects/krb5/sys/dev/hwpmc/hwpmc_core.c
  projects/krb5/sys/dev/hwpmc/hwpmc_intel.c
  projects/krb5/sys/dev/hwpmc/pmc_events.h
  projects/krb5/sys/dev/hyperv/netvsc/hn_rndis.c
  projects/krb5/sys/dev/hyperv/netvsc/if_hn.c
  projects/krb5/sys/dev/isp/isp_freebsd.c
  projects/krb5/sys/dev/ixgbe/if_ix.c
  projects/krb5/sys/dev/ixgbe/if_ixv.c
  projects/krb5/sys/dev/md/md.c
  projects/krb5/sys/dev/mfi/mfi.c
  projects/krb5/sys/dev/mpr/mpr.c
  projects/krb5/sys/dev/mpr/mpr_mapping.c
  projects/krb5/sys/dev/mpr/mpr_pci.c
  projects/krb5/sys/dev/mpr/mpr_sas.c
  projects/krb5/sys/dev/mpr/mpr_sas_lsi.c
  projects/krb5/sys/dev/mpr/mpr_user.c
  projects/krb5/sys/dev/mps/mps.c
  projects/krb5/sys/dev/mps/mps_mapping.c
  projects/krb5/sys/dev/mps/mps_pci.c
  projects/krb5/sys/dev/mps/mps_sas.c
  projects/krb5/sys/dev/mps/mps_sas_lsi.c
  projects/krb5/sys/dev/mps/mps_user.c
  projects/krb5/sys/dev/ntb/ntb.c
  projects/krb5/sys/dev/ntb/ntb.h
  projects/krb5/sys/dev/ntb/ntb_transport.c
  projects/krb5/sys/dev/nvme/nvme.c
  projects/krb5/sys/dev/nvme/nvme.h
  projects/krb5/sys/dev/nvme/nvme_ctrlr.c
  projects/krb5/sys/dev/nvme/nvme_ctrlr_cmd.c
  projects/krb5/sys/dev/nvme/nvme_ns.c
  projects/krb5/sys/dev/nvme/nvme_private.h
  projects/krb5/sys/dev/nvme/nvme_qpair.c
  projects/krb5/sys/dev/nvme/nvme_sim.c
  projects/krb5/sys/dev/nvme/nvme_sysctl.c
  projects/krb5/sys/dev/ppc/ppc_pci.c
  projects/krb5/sys/dev/qlnx/qlnxe/qlnx_os.c
  projects/krb5/sys/dev/qlxgbe/README.txt
  projects/krb5/sys/dev/qlxgbe/ql_boot.c
  projects/krb5/sys/dev/qlxgbe/ql_def.h
  projects/krb5/sys/dev/qlxgbe/ql_fw.c
  projects/krb5/sys/dev/qlxgbe/ql_glbl.h
  projects/krb5/sys/dev/qlxgbe/ql_hw.c
  projects/krb5/sys/dev/qlxgbe/ql_hw.h
  projects/krb5/sys/dev/qlxgbe/ql_inline.h
  projects/krb5/sys/dev/qlxgbe/ql_ioctl.c
  projects/krb5/sys/dev/qlxgbe/ql_isr.c
  projects/krb5/sys/dev/qlxgbe/ql_minidump.c
  projects/krb5/sys/dev/qlxgbe/ql_os.c
  projects/krb5/sys/dev/qlxgbe/ql_os.h
  projects/krb5/sys/dev/qlxgbe/ql_reset.c
  projects/krb5/sys/dev/qlxgbe/ql_ver.h
  projects/krb5/sys/dev/rtwn/if_rtwn_ridx.h
  projects/krb5/sys/dev/rtwn/if_rtwn_rx.c
  projects/krb5/sys/dev/rtwn/rtl8188e/r88e.h
  projects/krb5/sys/dev/rtwn/rtl8188e/r88e_chan.c
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c.h
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_chan.c
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_fw.c
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_priv.h
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_rx.c
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_tx.c
  projects/krb5/sys/dev/rtwn/rtl8192c/r92c_var.h
  projects/krb5/sys/dev/rtwn/rtl8192e/r92e_chan.c
  projects/krb5/sys/dev/rtwn/rtl8812a/r12a_chan.c
  projects/krb5/sys/dev/rtwn/rtl8812a/r12a_rx.c
  projects/krb5/sys/dev/rtwn/rtl8812a/r12a_tx.c
  projects/krb5/sys/dev/syscons/scvgarndr.c
  projects/krb5/sys/dev/syscons/syscons.c
  projects/krb5/sys/dev/syscons/syscons.h
  projects/krb5/sys/dev/usb/quirk/usb_quirk.c
  projects/krb5/sys/dev/usb/usbdevs
  projects/krb5/sys/dev/vxge/vxgehal/vxgehal-mrpcim.c
  projects/krb5/sys/fs/msdosfs/msdosfs_fat.c
  projects/krb5/sys/geom/eli/g_eli.c
  projects/krb5/sys/geom/eli/g_eli.h
  projects/krb5/sys/geom/eli/g_eli_ctl.c
  projects/krb5/sys/geom/geom_subr.c
  projects/krb5/sys/geom/part/g_part_gpt.c
  projects/krb5/sys/i386/conf/GENERIC
  projects/krb5/sys/i386/conf/NOTES
  projects/krb5/sys/i386/i386/trap.c
  projects/krb5/sys/i386/include/param.h
  projects/krb5/sys/kern/kern_cpuset.c
  projects/krb5/sys/kern/kern_dtrace.c
  projects/krb5/sys/kern/kern_lockstat.c
  projects/krb5/sys/kern/kern_mutex.c
  projects/krb5/sys/kern/kern_proc.c
  projects/krb5/sys/kern/kern_rwlock.c
  projects/krb5/sys/kern/kern_sx.c
  projects/krb5/sys/kern/kern_sysctl.c
  projects/krb5/sys/kern/subr_blist.c
  projects/krb5/sys/kern/subr_bus_dma.c
  projects/krb5/sys/kern/subr_smp.c
  projects/krb5/sys/kern/subr_turnstile.c
  projects/krb5/sys/kern/subr_vmem.c
  projects/krb5/sys/kern/sys_socket.c
  projects/krb5/sys/kern/uipc_sockbuf.c
  projects/krb5/sys/kern/uipc_socket.c
  projects/krb5/sys/kern/vfs_bio.c
  projects/krb5/sys/kern/vfs_cache.c
  projects/krb5/sys/kern/vfs_mountroot.c
  projects/krb5/sys/kern/vfs_subr.c
  projects/krb5/sys/mips/atheros/if_arge.c
  projects/krb5/sys/mips/cavium/octeon_ebt3000_cf.c
  projects/krb5/sys/mips/conf/ERL
  projects/krb5/sys/mips/include/_limits.h
  projects/krb5/sys/mips/mips/elf_machdep.c
  projects/krb5/sys/mips/mips/exception.S
  projects/krb5/sys/mips/mips/freebsd32_machdep.c
  projects/krb5/sys/mips/mips/pm_machdep.c
  projects/krb5/sys/mips/rmi/xls_ehci.c
  projects/krb5/sys/modules/Makefile
  projects/krb5/sys/modules/cxgbe/t4_firmware/Makefile
  projects/krb5/sys/modules/cxgbe/t5_firmware/Makefile
  projects/krb5/sys/modules/cxgbe/t6_firmware/Makefile
  projects/krb5/sys/modules/dtrace/Makefile
  projects/krb5/sys/modules/dtrace/dtraceall/Makefile
  projects/krb5/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/krb5/sys/modules/ntb/Makefile
  projects/krb5/sys/modules/nvme/Makefile
  projects/krb5/sys/modules/qlxgbe/Makefile
  projects/krb5/sys/net/ieee8023ad_lacp.c
  projects/krb5/sys/net/if.c
  projects/krb5/sys/net/if.h
  projects/krb5/sys/net/if_var.h
  projects/krb5/sys/net/iflib.c
  projects/krb5/sys/net/route.h
  projects/krb5/sys/net80211/ieee80211_output.c
  projects/krb5/sys/netinet/in_pcb.c
  projects/krb5/sys/netinet/in_pcb.h
  projects/krb5/sys/netinet/tcp_input.c
  projects/krb5/sys/netinet/tcp_stacks/fastpath.c
  projects/krb5/sys/netinet/tcp_timer.c
  projects/krb5/sys/netinet/tcp_var.h
  projects/krb5/sys/netipsec/udpencap.c
  projects/krb5/sys/ofed/drivers/infiniband/core/cma.c
  projects/krb5/sys/powerpc/conf/GENERIC
  projects/krb5/sys/riscv/conf/GENERIC
  projects/krb5/sys/security/audit/audit.c
  projects/krb5/sys/sparc64/conf/GENERIC
  projects/krb5/sys/sys/cdefs.h
  projects/krb5/sys/sys/consio.h
  projects/krb5/sys/sys/mdioctl.h
  projects/krb5/sys/sys/param.h
  projects/krb5/sys/sys/smp.h
  projects/krb5/sys/sys/sockio.h
  projects/krb5/sys/sys/systm.h
  projects/krb5/sys/ufs/ffs/ffs_softdep.c
  projects/krb5/sys/ufs/ffs/fs.h
  projects/krb5/sys/vm/swap_pager.c
  projects/krb5/sys/vm/swap_pager.h
  projects/krb5/sys/vm/uma_core.c
  projects/krb5/sys/vm/vm_fault.c
  projects/krb5/sys/vm/vm_object.c
  projects/krb5/sys/vm/vm_object.h
  projects/krb5/sys/vm/vm_page.c
  projects/krb5/sys/vm/vm_pageout.c
  projects/krb5/sys/vm/vm_pager.c
  projects/krb5/sys/vm/vm_phys.c
  projects/krb5/sys/vm/vm_phys.h
  projects/krb5/sys/x86/acpica/srat.c
  projects/krb5/sys/x86/cpufreq/hwpstate.c
  projects/krb5/sys/x86/include/apicreg.h
  projects/krb5/sys/x86/include/apicvar.h
  projects/krb5/sys/x86/include/specialreg.h
  projects/krb5/sys/x86/include/x86_var.h
  projects/krb5/sys/x86/iommu/intel_drv.c
  projects/krb5/sys/x86/pci/qpi.c
  projects/krb5/sys/x86/x86/identcpu.c
  projects/krb5/sys/x86/x86/io_apic.c
  projects/krb5/sys/x86/x86/mca.c
  projects/krb5/sys/x86/x86/mp_x86.c
  projects/krb5/tools/regression/sockets/accf_data_attach/accf_data_attach.c
  projects/krb5/tools/tools/nanobsd/embedded/common
  projects/krb5/usr.bin/calendar/calendars/calendar.freebsd
  projects/krb5/usr.bin/calendar/calendars/calendar.holiday
  projects/krb5/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.geschichte
  projects/krb5/usr.bin/clang/Makefile.inc
  projects/krb5/usr.bin/grep/grep.c
  projects/krb5/usr.bin/grep/grep.h
  projects/krb5/usr.bin/grep/util.c
  projects/krb5/usr.bin/kdump/kdump.c
  projects/krb5/usr.bin/netstat/inet.c
  projects/krb5/usr.bin/netstat/main.c
  projects/krb5/usr.bin/tail/extern.h
  projects/krb5/usr.bin/tail/tests/tail_test.sh
  projects/krb5/usr.bin/truss/extern.h
  projects/krb5/usr.bin/truss/setup.c
  projects/krb5/usr.bin/truss/syscall.h
  projects/krb5/usr.bin/truss/syscalls.c
  projects/krb5/usr.sbin/acpi/acpidb/Makefile
  projects/krb5/usr.sbin/acpi/acpidump/acpi.c
  projects/krb5/usr.sbin/acpi/iasl/Makefile
  projects/krb5/usr.sbin/autofs/auto_master.5
  projects/krb5/usr.sbin/binmiscctl/binmiscctl.8
  projects/krb5/usr.sbin/camdd/camdd.c
  projects/krb5/usr.sbin/chown/tests/chown_test.sh
  projects/krb5/usr.sbin/crunch/crunchgen/crunched_main.c
  projects/krb5/usr.sbin/crunch/crunchgen/crunchgen.c
  projects/krb5/usr.sbin/ctladm/ctladm.c
  projects/krb5/usr.sbin/efivar/Makefile
  projects/krb5/usr.sbin/efivar/efivar.8
  projects/krb5/usr.sbin/efivar/efivar.c
  projects/krb5/usr.sbin/makefs/mtree.c
  projects/krb5/usr.sbin/vidcontrol/vidcontrol.1
  projects/krb5/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  projects/krb5/   (props changed)
  projects/krb5/cddl/   (props changed)
  projects/krb5/cddl/contrib/opensolaris/   (props changed)
  projects/krb5/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/krb5/contrib/binutils/   (props changed)
  projects/krb5/contrib/compiler-rt/   (props changed)
  projects/krb5/contrib/file/   (props changed)
  projects/krb5/contrib/libc++/   (props changed)
  projects/krb5/contrib/llvm/   (props changed)
  projects/krb5/contrib/llvm/tools/clang/   (props changed)
  projects/krb5/contrib/llvm/tools/lld/   (props changed)
  projects/krb5/contrib/llvm/tools/lldb/   (props changed)
  projects/krb5/contrib/netbsd-tests/   (props changed)
  projects/krb5/contrib/top/   (props changed)
  projects/krb5/contrib/unbound/   (props changed)
  projects/krb5/contrib/zstd/   (props changed)
  projects/krb5/sys/cddl/contrib/opensolaris/   (props changed)
  projects/krb5/sys/contrib/dev/acpica/   (props changed)

Modified: projects/krb5/Makefile.inc1
==============================================================================

--- projects/krb5/Makefile.inc1	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/Makefile.inc1	Fri Sep  8 22:04:28 2017	(r323335)
@@ -557,7 +557,7 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MK_GDB=no MK_TESTS=no
+		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -1786,7 +1786,8 @@ update: .PHONY
 
 # ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
 # r296685 fix cross-endian objcopy
-.if ${BOOTSTRAPPING} < 1100102
+# r310724 fixed PR 215350, a crash in libdwarf with objects built by GCC 6.2.
+.if ${BOOTSTRAPPING} < 1200020
 _elftoolchain_libs= lib/libelf lib/libdwarf
 .endif
 
@@ -1984,8 +1985,12 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools
 _rescue=rescue/rescue
 .endif
 
+.if ${MK_TCSH} != "no"
+_tcsh=bin/csh
+.endif
+
 .for _tool in \
-    bin/csh \
+    ${_tcsh} \
     bin/sh \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
@@ -2143,7 +2148,7 @@ native-xtools: .PHONY
     bin/cat \
     bin/chmod \
     bin/cp \
-    bin/csh \
+    ${_tcsh} \
     bin/echo \
     bin/expr \
     bin/hostname \

Modified: projects/krb5/UPDATING
==============================================================================
--- projects/krb5/UPDATING	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/UPDATING	Fri Sep  8 22:04:28 2017	(r323335)
@@ -51,6 +51,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170826:
+       During boot the geli passphrase will be hidden. To restore previous
+       behavior see geli(8) configuration options.
+
+20170825:
+	Move PMTUD blackhole counters to TCPSTATS and remove them from bare
+	sysctl values.  Minor nit, but requires a rebuild of both world/kernel
+	to complete.
+
 20170814:
 	"make check" behavior (made in ^/head at r295380) has been changed to
 	execute from a limited sandbox, as opposed to executing from

Modified: projects/krb5/bin/chflags/Makefile
==============================================================================
--- projects/krb5/bin/chflags/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/chflags/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -4,4 +4,7 @@
 PACKAGE=runtime
 PROG=	chflags
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>

Modified: projects/krb5/bin/dd/args.c
==============================================================================
--- projects/krb5/bin/dd/args.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/dd/args.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
+#include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <inttypes.h>
@@ -184,7 +185,7 @@ f_bs(char *arg)
 
 	res = get_num(arg);
 	if (res < 1 || res > SSIZE_MAX)
-		errx(1, "bs must be between 1 and %jd", (intmax_t)SSIZE_MAX);
+		errx(1, "bs must be between 1 and %zd", (ssize_t)SSIZE_MAX);
 	in.dbsz = out.dbsz = (size_t)res;
 }
 
@@ -195,22 +196,22 @@ f_cbs(char *arg)
 
 	res = get_num(arg);
 	if (res < 1 || res > SSIZE_MAX)
-		errx(1, "cbs must be between 1 and %jd", (intmax_t)SSIZE_MAX);
+		errx(1, "cbs must be between 1 and %zd", (ssize_t)SSIZE_MAX);
 	cbsz = (size_t)res;
 }
 
 static void
 f_count(char *arg)
 {
-	intmax_t res;
+	uintmax_t res;
 
-	res = (intmax_t)get_num(arg);
-	if (res < 0)
-		errx(1, "count cannot be negative");
+	res = get_num(arg);
+	if (res == UINTMAX_MAX)
+		errc(1, ERANGE, "%s", oper);
 	if (res == 0)
-		cpy_cnt = (uintmax_t)-1;
+		cpy_cnt = UINTMAX_MAX;
 	else
-		cpy_cnt = (uintmax_t)res;
+		cpy_cnt = res;
 }
 
 static void
@@ -219,7 +220,7 @@ f_files(char *arg)
 
 	files_cnt = get_num(arg);
 	if (files_cnt < 1)
-		errx(1, "files must be between 1 and %jd", (uintmax_t)-1);
+		errx(1, "files must be between 1 and %zu", SIZE_MAX);
 }
 
 static void
@@ -240,8 +241,8 @@ f_ibs(char *arg)
 	if (!(ddflags & C_BS)) {
 		res = get_num(arg);
 		if (res < 1 || res > SSIZE_MAX)
-			errx(1, "ibs must be between 1 and %jd",
-			    (intmax_t)SSIZE_MAX);
+			errx(1, "ibs must be between 1 and %zd",
+			    (ssize_t)SSIZE_MAX);
 		in.dbsz = (size_t)res;
 	}
 }
@@ -261,8 +262,8 @@ f_obs(char *arg)
 	if (!(ddflags & C_BS)) {
 		res = get_num(arg);
 		if (res < 1 || res > SSIZE_MAX)
-			errx(1, "obs must be between 1 and %jd",
-			    (intmax_t)SSIZE_MAX);
+			errx(1, "obs must be between 1 and %zd",
+			    (ssize_t)SSIZE_MAX);
 		out.dbsz = (size_t)res;
 	}
 }

Modified: projects/krb5/bin/dd/conv.c
==============================================================================
--- projects/krb5/bin/dd/conv.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/dd/conv.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -133,7 +133,7 @@ block(void)
 	 */
 	ch = 0;
 	for (inp = in.dbp - in.dbcnt, outp = out.dbp; in.dbcnt;) {
-		maxlen = MIN(cbsz, in.dbcnt);
+		maxlen = MIN(cbsz, (size_t)in.dbcnt);
 		if ((t = ctab) != NULL)
 			for (cnt = 0; cnt < maxlen && (ch = *inp++) != '\n';
 			    ++cnt)
@@ -146,7 +146,7 @@ block(void)
 		 * Check for short record without a newline.  Reassemble the
 		 * input block.
 		 */
-		if (ch != '\n' && in.dbcnt < cbsz) {
+		if (ch != '\n' && (size_t)in.dbcnt < cbsz) {
 			(void)memmove(in.db, in.dbp - in.dbcnt, in.dbcnt);
 			break;
 		}
@@ -228,7 +228,7 @@ unblock(void)
 	 * translation has to already be done or we might not recognize the
 	 * spaces.
 	 */
-	for (inp = in.db; in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) {
+	for (inp = in.db; (size_t)in.dbcnt >= cbsz; inp += cbsz, in.dbcnt -= cbsz) {
 		for (t = inp + cbsz - 1; t >= inp && *t == ' '; --t)
 			;
 		if (t >= inp) {

Modified: projects/krb5/bin/dd/dd.c
==============================================================================
--- projects/krb5/bin/dd/dd.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/dd/dd.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -204,10 +204,10 @@ setup(void)
 	 * record oriented I/O, only need a single buffer.
 	 */
 	if (!(ddflags & (C_BLOCK | C_UNBLOCK))) {
-		if ((in.db = malloc(out.dbsz + in.dbsz - 1)) == NULL)
+		if ((in.db = malloc((size_t)out.dbsz + in.dbsz - 1)) == NULL)
 			err(1, "input buffer");
 		out.db = in.db;
-	} else if ((in.db = malloc(MAX(in.dbsz, cbsz) + cbsz)) == NULL ||
+	} else if ((in.db = malloc(MAX((size_t)in.dbsz, cbsz) + cbsz)) == NULL ||
 	    (out.db = malloc(out.dbsz + cbsz)) == NULL)
 		err(1, "output buffer");
 
@@ -405,7 +405,7 @@ dd_in(void)
 			++st.in_full;
 
 		/* Handle full input blocks. */
-		} else if ((size_t)n == in.dbsz) {
+		} else if ((size_t)n == (size_t)in.dbsz) {
 			in.dbcnt += in.dbrcnt = n;
 			++st.in_full;
 
@@ -562,7 +562,7 @@ dd_out(int force)
 			outp += nw;
 			st.bytes += nw;
 
-			if ((size_t)nw == n && n == out.dbsz)
+			if ((size_t)nw == n && n == (size_t)out.dbsz)
 				++st.out_full;
 			else
 				++st.out_part;

Modified: projects/krb5/bin/dd/dd.h
==============================================================================
--- projects/krb5/bin/dd/dd.h	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/dd/dd.h	Fri Sep  8 22:04:28 2017	(r323335)
@@ -38,10 +38,9 @@
 typedef struct {
 	u_char		*db;		/* buffer address */
 	u_char		*dbp;		/* current buffer I/O address */
-	/* XXX ssize_t? */
-	size_t		dbcnt;		/* current buffer byte count */
-	size_t		dbrcnt;		/* last read byte count */
-	size_t		dbsz;		/* block size */
+	ssize_t		dbcnt;		/* current buffer byte count */
+	ssize_t		dbrcnt;		/* last read byte count */
+	ssize_t		dbsz;		/* block size */
 
 #define	ISCHR		0x01		/* character device (warn on short) */
 #define	ISPIPE		0x02		/* pipe-like (see position.c) */

Modified: projects/krb5/bin/dd/position.c
==============================================================================
--- projects/krb5/bin/dd/position.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/dd/position.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -207,7 +207,7 @@ pos_out(void)
 			n = write(out.fd, out.db, out.dbsz);
 			if (n == -1)
 				err(1, "%s", out.name);
-			if ((size_t)n != out.dbsz)
+			if (n != out.dbsz)
 				errx(1, "%s: write failure", out.name);
 		}
 		break;

Modified: projects/krb5/bin/mkdir/Makefile
==============================================================================
--- projects/krb5/bin/mkdir/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/mkdir/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -4,4 +4,7 @@
 PACKAGE=runtime
 PROG=	mkdir
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>

Modified: projects/krb5/bin/pkill/pkill.c
==============================================================================
--- projects/krb5/bin/pkill/pkill.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/pkill/pkill.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -568,7 +568,7 @@ main(int argc, char **argv)
 			continue;
 		rv |= (*action)(kp);
 	}
-	if (rv && pgrep)
+	if (rv && pgrep && !quiet)
 		putchar('\n');
 	if (!did_action && !pgrep && longfmt)
 		fprintf(stderr,

Modified: projects/krb5/bin/ps/print.c
==============================================================================
--- projects/krb5/bin/ps/print.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/ps/print.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -262,9 +262,9 @@ state(KINFO *k, VARENT *ve __unused)
 	cp++;
 	if (!(flag & P_INMEM))
 		*cp++ = 'W';
-	if (k->ki_p->ki_nice < NZERO)
+	if (k->ki_p->ki_nice < NZERO || k->ki_p->ki_pri.pri_class == PRI_REALTIME)
 		*cp++ = '<';
-	else if (k->ki_p->ki_nice > NZERO)
+	else if (k->ki_p->ki_nice > NZERO || k->ki_p->ki_pri.pri_class == PRI_IDLE)
 		*cp++ = 'N';
 	if (flag & P_TRACED)
 		*cp++ = 'X';
@@ -274,6 +274,8 @@ state(KINFO *k, VARENT *ve __unused)
 		*cp++ = 'V';
 	if ((flag & P_SYSTEM) || k->ki_p->ki_lock > 0)
 		*cp++ = 'L';
+	if ((k->ki_p->ki_cr_flags & CRED_FLAG_CAPMODE) != 0)
+		*cp++ = 'C';
 	if (k->ki_p->ki_kiflag & KI_SLEADER)
 		*cp++ = 's';
 	if ((flag & P_CONTROLT) && k->ki_p->ki_pgid == k->ki_p->ki_tpgid)

Modified: projects/krb5/bin/ps/ps.1
==============================================================================
--- projects/krb5/bin/ps/ps.1	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/ps/ps.1	Fri Sep  8 22:04:28 2017	(r323335)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd July 25, 2017
+.Dd September 7, 2017
 .Dt PS 1
 .Os
 .Sh NAME
@@ -436,6 +436,10 @@ information:
 The process is in the foreground process group of its control terminal.
 .It Li <
 The process has raised CPU scheduling priority.
+.It Li C
+The process is in
+.Xr capsicum 4
+capability mode.
 .It Li E
 The process is trying to exit.
 .It Li J
@@ -541,7 +545,7 @@ short-term CPU usage factor (for scheduling)
 .It Cm dsiz
 data size (in Kbytes)
 .It Cm emul
-system-call emulation environment
+system-call emulation environment (ABI)
 .It Cm etime
 elapsed running time, format
 .Op days- Ns

Modified: projects/krb5/bin/rcp/Makefile
==============================================================================
--- projects/krb5/bin/rcp/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/rcp/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -11,4 +11,7 @@ PACKAGE=rcmds
 BINOWN=	root
 BINMODE=4555
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>

Modified: projects/krb5/bin/rmdir/Makefile
==============================================================================
--- projects/krb5/bin/rmdir/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/bin/rmdir/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -4,4 +4,7 @@
 PACKAGE=runtime
 PROG=	rmdir
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>

Modified: projects/krb5/cddl/compat/opensolaris/misc/zmount.c
==============================================================================
--- projects/krb5/cddl/compat/opensolaris/misc/zmount.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/compat/opensolaris/misc/zmount.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -74,7 +74,7 @@ zmount(const char *spec, const char *dir, int mflag, c
     char *dataptr, int datalen, char *optptr, int optlen)
 {
 	struct iovec *iov;
-	char *optstr, *os, *p;
+	char *optstr, *os, *p, *tofree;
 	int iovlen, rv;
 
 	assert(spec != NULL);
@@ -87,7 +87,7 @@ zmount(const char *spec, const char *dir, int mflag, c
 	assert(optptr != NULL);
 	assert(optlen > 0);
 
-	optstr = strdup(optptr);
+	tofree = optstr = strdup(optptr);
 	assert(optstr != NULL);
 
 	iov = NULL;
@@ -98,11 +98,9 @@ zmount(const char *spec, const char *dir, int mflag, c
 	build_iovec(&iov, &iovlen, "fspath", __DECONST(char *, dir),
 	    (size_t)-1);
 	build_iovec(&iov, &iovlen, "from", __DECONST(char *, spec), (size_t)-1);
-	for (p = optstr; p != NULL; strsep(&p, ",/ ")) {
-		if (*p != '\0')
-			build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
-	}
+	while ((p = strsep(&optstr, ",/")) != NULL)
+		build_iovec(&iov, &iovlen, p, NULL, (size_t)-1);
 	rv = nmount(iov, iovlen, 0);
-	free(optstr);
+	free(tofree);
 	return (rv);
 }

Copied: projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d (from r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/krb5/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d	Fri Sep  8 22:04:28 2017	(r323335, copy of r323334, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/llquantize/err.D_LLQUANT_MAGTOOBIG.offbyone.d)
@@ -0,0 +1,25 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2017 Mark Johnston <markj at FreeBSD.org>
+ */
+
+/*
+ * A regression test for FreeBSD r322773. 100^9 fits in 64 bits, but
+ * llquantize() will create buckets up to 100^{10}, which does not fit.
+ */
+
+BEGIN
+{
+	@ = llquantize(0, 100, 0, 9, 100);
+	exit(0);
+}

Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
==============================================================================
--- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -1503,7 +1503,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra
 			    "divide a power of the factor\n");
 		}
 
-		for (i = 0, order = 1; i < args[2].value; i++) {
+		for (i = 0, order = 1; i <= args[2].value + 1; i++) {
 			if (order * args[0].value > order) {
 				order *= args[0].value;
 				continue;
@@ -1511,7 +1511,7 @@ dt_compile_agg(dtrace_hdl_t *dtp, dt_node_t *dnp, dtra
 
 			dnerror(dnp, D_LLQUANT_MAGTOOBIG, "llquantize( ) "
 			    "factor (%d) raised to power of high magnitude "
-			    "(%d) overflows 64-bits\n", args[0].value,
+			    "(%d) plus 1 overflows 64-bits\n", args[0].value,
 			    args[2].value);
 		}
 

Modified: projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d
 
 			(void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1);
 
-			if ((fd = open(path, O_RDONLY)) == -1)
+			if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
 				continue; /* failed to open driver; just skip it */
 
 			if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) ||
@@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp,
 	 */
 	dt_provmod_open(&provmod, &df);
 
-	dtfd = open("/dev/dtrace/dtrace", O_RDWR);
+	dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC);
 	err = errno; /* save errno from opening dtfd */
 #if defined(__FreeBSD__)
 	/*
@@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp,
 #ifdef illumos
 	ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR);
 #else
-	ftfd = open("/dev/dtrace/fasttrap", O_RDWR);
+	ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC);
 #endif
 	fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */
 
@@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp,
 		}
 		return (set_open_errno(dtp, errp, err));
 	}
-
-	(void) fcntl(dtfd, F_SETFD, FD_CLOEXEC);
-	(void) fcntl(ftfd, F_SETFD, FD_CLOEXEC);
 
 alloc:
 	if ((dtp = malloc(sizeof (dtrace_hdl_t))) == NULL) {

Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Fri Sep  8 22:04:28 2017	(r323335)
@@ -772,6 +772,7 @@ extern int zpool_in_use(libzfs_handle_t *, int, pool_s
  * Label manipulation.
  */
 extern int zpool_read_label(int, nvlist_t **);
+extern int zpool_read_all_labels(int, nvlist_t **);
 extern int zpool_clear_label(int);
 
 /* is this zvol valid for use as a dump device? */

Modified: projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -914,6 +914,65 @@ zpool_read_label(int fd, nvlist_t **config)
 	return (0);
 }
 
+/*
+ * Given a file descriptor, read the label information and return an nvlist
+ * describing the configuration, if there is one.
+ * returns the number of valid labels found
+ */
+int
+zpool_read_all_labels(int fd, nvlist_t **config)
+{
+	struct stat64 statbuf;
+	int l;
+	vdev_label_t *label;
+	uint64_t state, txg, size;
+	int nlabels = 0;
+
+	*config = NULL;
+
+	if (fstat64(fd, &statbuf) == -1)
+		return (0);
+	size = P2ALIGN_TYPED(statbuf.st_size, sizeof (vdev_label_t), uint64_t);
+
+	if ((label = malloc(sizeof (vdev_label_t))) == NULL)
+		return (0);
+
+	for (l = 0; l < VDEV_LABELS; l++) {
+		nvlist_t *temp = NULL;
+
+		/* TODO: use aio_read so we can read al 4 labels in parallel */
+		if (pread64(fd, label, sizeof (vdev_label_t),
+		    label_offset(size, l)) != sizeof (vdev_label_t))
+			continue;
+
+		if (nvlist_unpack(label->vl_vdev_phys.vp_nvlist,
+		    sizeof (label->vl_vdev_phys.vp_nvlist), &temp, 0) != 0)
+			continue;
+
+		if (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_STATE,
+		    &state) != 0 || state > POOL_STATE_L2CACHE) {
+			nvlist_free(temp);
+			temp = NULL;
+			continue;
+		}
+
+		if (state != POOL_STATE_SPARE && state != POOL_STATE_L2CACHE &&
+		    (nvlist_lookup_uint64(temp, ZPOOL_CONFIG_POOL_TXG,
+		    &txg) != 0 || txg == 0)) {
+			nvlist_free(temp);
+			temp = NULL;
+			continue;
+		}
+		if (temp)
+			*config = temp;
+
+		nlabels++;
+	}
+
+	free(label);
+	return (nlabels);
+}
+
 typedef struct rdsk_node {
 	char *rn_name;
 	int rn_dfd;

Modified: projects/krb5/cddl/lib/libdtrace/Makefile
==============================================================================
--- projects/krb5/cddl/lib/libdtrace/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/lib/libdtrace/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -54,6 +54,7 @@ DSRCS=		errno.d			\
 		siftr.d			\
 		signal.d		\
 		tcp.d			\
+		socket.d		\
 		udp.d			\
 		unistd.d
 

Copied: projects/krb5/cddl/lib/libdtrace/socket.d (from r323334, head/cddl/lib/libdtrace/socket.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/krb5/cddl/lib/libdtrace/socket.d	Fri Sep  8 22:04:28 2017	(r323335, copy of r323334, head/cddl/lib/libdtrace/socket.d)
@@ -0,0 +1,301 @@
+/*
+ * Copyright (c) 2017 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ *
+ * Translators and flags for the socket structure.  FreeBSD specific code.
+ */
+
+#pragma D depends_on module kernel
+
+/*
+ * Option flags per-socket.
+ */
+#pragma D binding "1.13" SO_DEBUG
+inline int SO_DEBUG =		0x0001;		/* turn on debugging info recording */
+#pragma D binding "1.13" SO_ACCEPTCONN
+inline int SO_ACCEPTCONN = 	0x0002;		/* socket has had listen() */
+#pragma D binding "1.13" SO_REUSEADDR
+inline int SO_REUSEADDR =	0x0004;		/* allow local address reuse */
+#pragma D binding "1.13" SO_KEEPALIVE
+inline int SO_KEEPALIVE =	0x0008;		/* keep connections alive */
+#pragma D binding "1.13" SO_DONTROUTE
+inline int SO_DONTROUTE =	0x0010;		/* just use interface addresses */
+#pragma D binding "1.13" SO_BROADCAST
+inline int SO_BROADCAST =	0x0020;		/* permit sending of broadcast msgs */
+#pragma D binding "1.13" SO_USELOOPBACK
+inline int SO_USELOOPBACK =	0x0040;		/* bypass hardware when possible */
+#pragma D binding "1.13" SO_LINGER
+inline int SO_LINGER =		0x0080;		/* linger on close if data present */
+#pragma D binding "1.13" SO_OOBINLINE
+inline int SO_OOBINLINE =	0x0100;		/* leave received OOB data in line */
+#pragma D binding "1.13" SO_REUSEPORT
+inline int SO_REUSEPORT =	0x0200;		/* allow local address & port reuse */
+#pragma D binding "1.13" SO_TIMESTAMP
+inline int SO_TIMESTAMP =	0x0400;		/* timestamp received dgram traffic */
+#pragma D binding "1.13" SO_NOSIGPIPE
+inline int SO_NOSIGPIPE =	0x0800;		/* no SIGPIPE from EPIPE */
+#pragma D binding "1.13" SO_ACCEPTFILTER
+inline int SO_ACCEPTFILTER =	0x1000;		/* there is an accept filter */
+#pragma D binding "1.13" SO_BINTIME
+inline int SO_BINTIME =		0x2000;		/* timestamp received dgram traffic */
+#pragma D binding "1.13" SO_NO_OFFLOAD
+inline int SO_NO_OFFLOAD =	0x4000;		/* socket cannot be offloaded */
+#pragma D binding "1.13" SO_NO_DDP
+inline int SO_NO_DDP =		0x8000;		/* disable direct data placement */
+
+/*
+ * Additional options, not kept in so_options.
+ */
+#pragma D binding "1.13" SO_SNDBUF
+inline int SO_SNDBUF =		0x1001;		/* send buffer size */
+#pragma D binding "1.13" SO_RCVBUF
+inline int SO_RCVBUF =		0x1002;		/* receive buffer size */
+#pragma D binding "1.13" SO_SNDLOWAT
+inline int SO_SNDLOWAT =	0x1003;		/* send low-water mark */
+#pragma D binding "1.13" SO_RCVLOWAT
+inline int SO_RCVLOWAT =	0x1004;		/* receive low-water mark */
+#pragma D binding "1.13" SO_SNDTIMEO
+inline int SO_SNDTIMEO =	0x1005;		/* send timeout */
+#pragma D binding "1.13" SO_RCVTIMEO
+inline int SO_RCVTIMEO =	0x1006;		/* receive timeout */
+#pragma D binding "1.13" SO_ERROR
+inline int SO_ERROR =		0x1007;		/* get error status and clear */
+#pragma D binding "1.13" SO_TYPE
+inline int SO_TYPE =		0x1008;		/* get socket type */
+#pragma D binding "1.13" SO_LABEL
+inline int SO_LABEL =		0x1009;		/* socket's MAC label */
+#pragma D binding "1.13" SO_PEERLABEL
+inline int SO_PEERLABEL =	0x1010;		/* socket's peer's MAC label */
+#pragma D binding "1.13" SO_LISTENQLIMIT
+inline int SO_LISTENQLIMIT =	0x1011;		/* socket's backlog limit */
+#pragma D binding "1.13" SO_LISTENQLEN
+inline int SO_LISTENQLEN =	0x1012;		/* socket's complete queue length */
+#pragma D binding "1.13" SO_LISTENINCQLEN
+inline int SO_LISTENINCQLEN =	0x1013;		/* socket's incomplete queue length */
+#pragma D binding "1.13" SO_SETFIB
+inline int SO_SETFIB =		0x1014;		/* use this FIB to route */
+#pragma D binding "1.13" SO_USER_COOKIE
+inline int SO_USER_COOKIE =	0x1015;		/* user cookie (dummynet etc.) */
+#pragma D binding "1.13" SO_PROTOCOL
+inline int SO_PROTOCOL =	0x1016;		/* get socket protocol (Linux name) */
+#pragma D binding "1.13" SO_PROTOTYPE
+inline int SO_PROTOTYPE =	SO_PROTOCOL;	/* alias for SO_PROTOCOL (SunOS name) */
+#pragma D binding "1.13" SO_TS_CLOCK
+inline int SO_TS_CLOCK =	0x1017;		/* clock type used for SO_TIMESTAMP */
+#pragma D binding "1.13" SO_MAX_PACING_RATE
+inline int SO_MAX_PACING_RATE = 0x1018;	/* socket's max TX pacing rate (Linux name) */
+
+#pragma D binding "1.13" SO_TS_REALTIME_MICRO
+inline int SO_TS_REALTIME_MICRO =	0;	/* microsecond resolution, realtime */
+#pragma D binding "1.13" SO_TS_BINTIME
+inline int SO_TS_BINTIME = 		1;	/* sub-nanosecond resolution, realtime */
+#pragma D binding "1.13" SO_TS_REALTIME
+inline int SO_TS_REALTIME = 		2;	/* nanosecond resolution, realtime */
+#pragma D binding "1.13" SO_TS_MONOTONIC
+inline int SO_TS_MONOTONIC =		3;	/* nanosecond resolution, monotonic */
+#pragma D binding "1.13" SO_TS_DEFAULT
+inline int SO_TS_DEFAULT = 		SO_TS_REALTIME_MICRO;
+#pragma D binding "1.13" SO_TS_CLOCK_MAX
+inline int SO_TS_CLOCK_MAX = 		SO_TS_MONOTONIC;
+
+#pragma D binding "1.13" AF_UNSPEC
+inline int AF_UNSPEC =		0;		/* unspecified */
+#pragma D binding "1.13" AF_UNIX
+inline int AF_UNIX =		1;		/* standardized name for AF_LOCAL */
+#pragma D binding "1.13" AF_LOCAL
+inline int AF_LOCAL =		AF_UNIX;	/* local to host (pipes, portals) */
+#pragma D binding "1.13" AF_INET
+inline int AF_INET =		2;		/* internetwork: UDP, TCP, etc. */
+#pragma D binding "1.13" AF_IMPLINK
+inline int AF_IMPLINK =	3;		/* arpanet imp addresses */
+#pragma D binding "1.13" AF_PUP
+inline int AF_PUP =		4;		/* pup protocols: e.g. BSP */
+#pragma D binding "1.13" AF_CHAOS
+inline int AF_CHAOS =		5;		/* mit CHAOS protocols */
+#pragma D binding "1.13" AF_NETBIOS
+inline int AF_NETBIOS =	6;		/* SMB protocols */
+#pragma D binding "1.13" AF_ISO
+inline int AF_ISO =		7;		/* ISO protocols */
+#pragma D binding "1.13" AF_OSI
+inline int AF_OSI =		AF_ISO;
+#pragma D binding "1.13" AF_ECMA
+inline int AF_ECMA =		8;		/* European computer manufacturers */
+#pragma D binding "1.13" AF_DATAKIT
+inline int AF_DATAKIT =		9;		/* datakit protocols */
+#pragma D binding "1.13" AF_CCITT
+inline int AF_CCITT =		10;		/* CCITT protocols, X.25 etc */
+#pragma D binding "1.13" AF_SNA
+inline int AF_SNA =		11;		/* IBM SNA */
+#pragma D binding "1.13" AF_DECnet
+inline int AF_DECnet =		12;		/* DECnet */
+#pragma D binding "1.13" AF_DLI
+inline int AF_DLI =		13;		/* DEC Direct data link interface */
+#pragma D binding "1.13" AF_LAT
+inline int AF_LAT =		14;		/* LAT */
+#pragma D binding "1.13" AF_HYLINK
+inline int AF_HYLINK =		15;		/* NSC Hyperchannel */
+#pragma D binding "1.13" AF_APPLETALK
+inline int AF_APPLETALK =	16;		/* Apple Talk */
+#pragma D binding "1.13" AF_ROUTE
+inline int AF_ROUTE =		17;		/* Internal Routing Protocol */
+#pragma D binding "1.13" AF_LINK
+inline int AF_LINK =		18;		/* Link layer interface */
+#pragma D binding "1.13" pseudo_AF_XTP
+inline int pseudo_AF_XTP =	19;		/* eXpress Transfer Protocol (no AF) */
+#pragma D binding "1.13" AF_COIP
+inline int AF_COIP =		20;		/* connection-oriented IP, aka ST II */
+#pragma D binding "1.13" AF_CNT
+inline int AF_CNT =		21;		/* Computer Network Technology */
+#pragma D binding "1.13" pseudo_AF_RTIP
+inline int pseudo_AF_RTIP =	22;		/* Help Identify RTIP packets */
+#pragma D binding "1.13" AF_IPX
+inline int AF_IPX =		23;		/* Novell Internet Protocol */
+#pragma D binding "1.13" AF_SIP
+inline int AF_SIP =		24;		/* Simple Internet Protocol */
+#pragma D binding "1.13" pseudo_AF_PIP
+inline int pseudo_AF_PIP =	25;		/* Help Identify PIP packets */
+#pragma D binding "1.13" AF_ISDN
+inline int AF_ISDN =		26;		/* Integrated Services Digital Network*/
+#pragma D binding "1.13" AF_E164
+inline int AF_E164 =		AF_ISDN;	/* CCITT E.164 recommendation */
+#pragma D binding "1.13" pseudo_AF_KEY
+inline int pseudo_AF_KEY =	27;		/* Internal key-management function */
+#pragma D binding "1.13" AF_INET6
+inline int AF_INET6 =		28;		/* IPv6 */
+#pragma D binding "1.13" AF_NATM
+inline int AF_NATM =		29;		/* native ATM access */
+#pragma D binding "1.13" AF_ATM
+inline int AF_ATM =		30;		/* ATM */
+#pragma D binding "1.13" pseudo_AF_HDRCMPLT
+inline int pseudo_AF_HDRCMPLT = 31;	/* Used by BPF to not rewrite headers
+					 * in interface output routine
+					 */
+#pragma D binding "1.13" AF_NETGRAPH
+inline int AF_NETGRAPH =	32;		/* Netgraph sockets */
+#pragma D binding "1.13" AF_SLOW
+inline int AF_SLOW =		33;		/* 802.3ad slow protocol */
+#pragma D binding "1.13" AF_SCLUSTER
+inline int AF_SCLUSTER =	34;		/* Sitara cluster protocol */
+#pragma D binding "1.13" AF_ARP
+inline int AF_ARP =		35;		/* Address Resolution Protocol */
+#pragma D binding "1.13" AF_BLUETOOTH
+inline int AF_BLUETOOTH =	36;		/* Bluetooth sockets */
+#pragma D binding "1.13" AF_IEEE80211
+inline int AF_IEEE80211 =	37;		/* IEEE 802.11 protocol */
+#pragma D binding "1.13" AF_INET_SDP
+inline int AF_INET_SDP	=	40;		/* OFED Socket Direct Protocol ipv4 */
+#pragma D binding "1.13" AF_INET6_SDP
+inline int AF_INET6_SDP =	42;		/* OFED Socket Direct Protocol ipv6 */
+#pragma D binding "1.13" AF_MAX
+inline int AF_MAX =		42;
+
+/*
+ * Protocol families, same as address families for now.
+ */
+#pragma D binding "1.13" PF_UNSPEC
+inline int PF_UNSPEC =	AF_UNSPEC;
+#pragma D binding "1.13" PF_LOCAL
+inline int PF_LOCAL =	AF_LOCAL;
+#pragma D binding "1.13" PF_UNIX
+inline int PF_UNIX =	PF_LOCAL;	/* backward compatibility */
+#pragma D binding "1.13" PF_INET
+inline int PF_INET =	AF_INET;
+#pragma D binding "1.13" PF_IMPLINK
+inline int PF_IMPLINK =	AF_IMPLINK;
+#pragma D binding "1.13" PF_PUP
+inline int PF_PUP =	AF_PUP;
+#pragma D binding "1.13" PF_CHAOS
+inline int PF_CHAOS =	AF_CHAOS;
+#pragma D binding "1.13" PF_NETBIOS
+inline int PF_NETBIOS =	AF_NETBIOS;
+#pragma D binding "1.13" PF_ISO
+inline int PF_ISO =	AF_ISO;
+#pragma D binding "1.13" PF_OSI
+inline int PF_OSI =	AF_ISO;
+#pragma D binding "1.13" PF_ECMA
+inline int PF_ECMA =	AF_ECMA;
+#pragma D binding "1.13" PF_DATAKIT
+inline int PF_DATAKIT =	AF_DATAKIT;
+#pragma D binding "1.13" PF_CCITT
+inline int PF_CCITT =	AF_CCITT;
+#pragma D binding "1.13" PF_SNA
+inline int PF_SNA =	AF_SNA;
+#pragma D binding "1.13" PF_DECnet
+inline int PF_DECnet =	AF_DECnet;
+#pragma D binding "1.13" PF_DLI
+inline int PF_DLI =	AF_DLI;
+#pragma D binding "1.13" PF_LAT
+inline int PF_LAT =	AF_LAT;
+#pragma D binding "1.13" PF_HYLINK
+inline int PF_HYLINK =	AF_HYLINK;
+#pragma D binding "1.13" PF_APPLETALK
+inline int PF_APPLETALK =	AF_APPLETALK;
+#pragma D binding "1.13" PF_ROUTE
+inline int PF_ROUTE =	AF_ROUTE;
+#pragma D binding "1.13" PF_LINK
+inline int PF_LINK =	AF_LINK;
+#pragma D binding "1.13" PF_XTP
+inline int PF_XTP =	pseudo_AF_XTP;	/* really just proto family, no AF */
+#pragma D binding "1.13" PF_COIP
+inline int PF_COIP =	AF_COIP;
+#pragma D binding "1.13" PF_CNT
+inline int PF_CNT =	AF_CNT;
+#pragma D binding "1.13" PF_SIP
+inline int PF_SIP =	AF_SIP;
+#pragma D binding "1.13" PF_IPX
+inline int PF_IPX =	AF_IPX;
+#pragma D binding "1.13" PF_RTIP
+inline int PF_RTIP =	pseudo_AF_RTIP;	/* same format as AF_INET */
+#pragma D binding "1.13" PF_PIP
+inline int PF_PIP =	pseudo_AF_PIP;
+#pragma D binding "1.13" PF_ISDN
+inline int PF_ISDN =	AF_ISDN;
+#pragma D binding "1.13" PF_KEY
+inline int PF_KEY =	pseudo_AF_KEY;
+#pragma D binding "1.13" PF_INET6
+inline int PF_INET6 =	AF_INET6;
+#pragma D binding "1.13" PF_NATM
+inline int PF_NATM =	AF_NATM;
+#pragma D binding "1.13" PF_ATM
+inline int PF_ATM =	AF_ATM;
+#pragma D binding "1.13" PF_NETGRAPH
+inline int PF_NETGRAPH =	AF_NETGRAPH;
+#pragma D binding "1.13" PF_SLOW
+inline int PF_SLOW =	AF_SLOW;
+#pragma D binding "1.13" PF_SCLUSTER
+inline int PF_SCLUSTER =	AF_SCLUSTER;
+#pragma D binding "1.13" PF_ARP
+inline int PF_ARP =	AF_ARP;
+#pragma D binding "1.13" PF_BLUETOOTH
+inline int PF_BLUETOOTH =	AF_BLUETOOTH;
+#pragma D binding "1.13" PF_IEEE80211
+inline int PF_IEEE80211 =	AF_IEEE80211;
+#pragma D binding "1.13" PF_INET_SDP
+inline int PF_INET_SDP=	AF_INET_SDP;
+#pragma D binding "1.13" PF_INET6_SDP
+inline int PF_INET6_SDP=	AF_INET6_SDP;
+#pragma D binding "1.13" PF_MAX
+inline int PF_MAX =	AF_MAX;

Modified: projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile
==============================================================================
--- projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile	Fri Sep  8 22:04:28 2017	(r323335)
@@ -22,6 +22,7 @@ ${PACKAGE}FILES= \
      err.D_LLQUANT_LOWVAL.d  \
      err.D_LLQUANT_MAGRANGE.d  \
      err.D_LLQUANT_MAGTOOBIG.d  \
+     err.D_LLQUANT_MAGTOOBIG.offbyone.d  \
      err.D_LLQUANT_NSTEPMATCH.d  \
      err.D_LLQUANT_NSTEPTYPE.d  \
      err.D_LLQUANT_NSTEPVAL.d  \

Modified: projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc
==============================================================================
--- projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/cddl/usr.sbin/zfsd/zfsd_event.cc	Fri Sep  8 22:04:28 2017	(r323335)
@@ -36,6 +36,7 @@
 #include <sys/cdefs.h>
 #include <sys/time.h>
 #include <sys/fs/zfs.h>
+#include <sys/vdev_impl.h>
 
 #include <syslog.h>
 
@@ -93,6 +94,7 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de
 	pool_state_t poolState;
 	char        *poolName;
 	boolean_t    b_inuse;
+	int          nlabels;
 
 	inUse    = false;
 	degraded = false;
@@ -105,8 +107,16 @@ DevfsEvent::ReadLabel(int devFd, bool &inUse, bool &de
 		if (poolName != NULL)
 			free(poolName);
 
-		if (zpool_read_label(devFd, &devLabel) != 0
-		 || devLabel == NULL)
+		nlabels = zpool_read_all_labels(devFd, &devLabel);
+		/*
+		 * If we find a disk with fewer than the maximum number of
+		 * labels, it might be the whole disk of a partitioned disk
+		 * where ZFS resides on a partition.  In that case, we should do
+		 * nothing and wait for the partition to appear.  Or, the disk
+		 * might be damaged.  In that case, zfsd should do nothing and
+		 * wait for the sysadmin to decide.
+		 */
+		if (nlabels != VDEV_LABELS || devLabel == NULL)
 			return (NULL);
 
 		try {

Modified: projects/krb5/contrib/binutils/opcodes/i386-dis.c
==============================================================================
--- projects/krb5/contrib/binutils/opcodes/i386-dis.c	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/contrib/binutils/opcodes/i386-dis.c	Fri Sep  8 22:04:28 2017	(r323335)
@@ -1302,7 +1302,7 @@ static const unsigned char twobyte_uses_REPZ_prefix[25
   /* 70 */ 1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1, /* 7f */
   /* 80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 8f */
   /* 90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 9f */
-  /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* af */
+  /* a0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0, /* af */
   /* b0 */ 0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0, /* bf */
   /* c0 */ 0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0, /* cf */
   /* d0 */ 0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0, /* df */
@@ -1793,10 +1793,10 @@ static const struct dis386 grps[][8] = {
   },
   /* GRP15 */
   {
-    { "fxsave",		{ Ev } },
-    { "fxrstor",	{ Ev } },
-    { "ldmxcsr",	{ Ev } },
-    { "stmxcsr",	{ Ev } },
+    { "fxsave",		{ { OP_0fae, v_mode } } },
+    { "fxrstor",	{ { OP_0fae, v_mode } } },
+    { "ldmxcsr",	{ { OP_0fae, v_mode } } },
+    { "stmxcsr",	{ { OP_0fae, v_mode } } },
     { "xsave",		{ Ev } },
     { "xrstor",		{ { OP_0fae, v_mode } } },
     { "xsaveopt",	{ { OP_0fae, v_mode } } },
@@ -5997,19 +5997,34 @@ OP_0fae (int bytemode, int sizeflag)
 {
   if (modrm.mod == 3)
     {
-      if (modrm.reg == 7)
-	strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence");
-      else if (modrm.reg == 6)
-	strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence");
-      else if (modrm.reg == 5)
-	strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence");
-
-      if (modrm.reg < 5 || modrm.rm != 0)
+      if (modrm.reg >= 5 && modrm.reg <= 7 && modrm.rm == 0)
 	{
-	  BadOp ();	/* bad sfence, mfence, or lfence */
+	  if (modrm.reg == 7)
+	    strcpy (obuf + strlen (obuf) - sizeof ("clflush") + 1, "sfence");
+	  else if (modrm.reg == 6)
+	    strcpy (obuf + strlen (obuf) - sizeof ("xsaveopt") + 1, "mfence");
+	  else if (modrm.reg == 5)
+	    strcpy (obuf + strlen (obuf) - sizeof ("xrstor") + 1, "lfence");
+	  bytemode = 0;
+	}
+      else if (modrm.reg <= 3 && (prefixes & PREFIX_REPZ) != 0)
+	{
+	  if (modrm.reg == 0)
+	    strcpy (obuf + strlen (obuf) - sizeof ("fxsave") + 1, "rdfsbase");
+	  else if (modrm.reg == 1)
+	    strcpy (obuf + strlen (obuf) - sizeof ("fxrstor") + 1, "rdgsbase");
+	  else if (modrm.reg == 2)
+	    strcpy (obuf + strlen (obuf) - sizeof ("ldmxcsr") + 1, "wrfsbase");
+	  else if (modrm.reg == 3)
+	    strcpy (obuf + strlen (obuf) - sizeof ("stmxcsr") + 1, "wrgsbase");
+	  used_prefixes |= PREFIX_REPZ;
+	  bytemode = dq_mode;
+	}
+      else
+	{
+	  BadOp ();
 	  return;
 	}
-      bytemode = 0;
     }
 
   OP_E (bytemode, sizeflag);

Modified: projects/krb5/contrib/binutils/opcodes/i386-opc.h
==============================================================================
--- projects/krb5/contrib/binutils/opcodes/i386-opc.h	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/contrib/binutils/opcodes/i386-opc.h	Fri Sep  8 22:04:28 2017	(r323335)
@@ -81,6 +81,7 @@ typedef struct template
 #define CpuPCLMUL   0x10000000	/* Carry-less Multiplication extensions */
 #define CpuRdRnd    0x20000000	/* Intel Random Number Generator extensions */
 #define CpuSMAP     0x40000000	/* Intel Supervisor Mode Access Prevention */
+#define CpuFSGSBase 0x80000000	/* Read/write fs/gs segment base registers */
 
 /* SSE4.1/4.2 Instructions required */
 #define CpuSSE4	     (CpuSSE4_1|CpuSSE4_2)
@@ -89,7 +90,8 @@ typedef struct template
 #define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \
 	|CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \
 	|Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \
-	|CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP)
+	|CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd|CpuSMAP \
+	|CpuFSGSBase)
 
   /* the bits in opcode_modifier are used to generate the final opcode from
      the base_opcode.  These bits also are used to detect alternate forms of

Modified: projects/krb5/contrib/binutils/opcodes/i386-opc.tbl
==============================================================================
--- projects/krb5/contrib/binutils/opcodes/i386-opc.tbl	Fri Sep  8 21:47:05 2017	(r323334)
+++ projects/krb5/contrib/binutils/opcodes/i386-opc.tbl	Fri Sep  8 22:04:28 2017	(r323335)
@@ -1525,3 +1525,13 @@ pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|Ig
 // Intel Random Number Generator extensions
 rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 }
 rdseed, 1, 0x0fc7, 0x7, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 }
+
+// Intel Supervisor Mode Access Prevention extensions
+clac, 0, 0x0f01, 0xca, CpuSMAP, NoSuf|ImmExt, { 0 }
+stac, 0, 0x0f01, 0xcb, CpuSMAP, NoSuf|ImmExt, { 0 }
+
+// Read/write fs/gs segment base registers

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