svn commit: r322417 - in projects/numa2: . bin/cat bin/chmod/tests bin/date bin/dd bin/df bin/echo bin/expr bin/ln bin/ls bin/mv bin/pax bin/pkill bin/sh bin/sleep bin/test cddl cddl/contrib/openso...

Fri Aug 11 22:39:46 UTC 2017

Author: markj
Date: Fri Aug 11 22:39:38 2017
New Revision: 322417
URL: https://svnweb.freebsd.org/changeset/base/322417

Log:
  MFH at r322416.

Added:
  projects/numa2/contrib/mdocml/compat_recallocarray.c
     - copied unchanged from r322416, head/contrib/mdocml/compat_recallocarray.c
  projects/numa2/contrib/mdocml/mandoc_xr.c
     - copied unchanged from r322416, head/contrib/mdocml/mandoc_xr.c
  projects/numa2/contrib/mdocml/mandoc_xr.h
     - copied unchanged from r322416, head/contrib/mdocml/mandoc_xr.h
  projects/numa2/contrib/mdocml/test-recallocarray.c
     - copied unchanged from r322416, head/contrib/mdocml/test-recallocarray.c
  projects/numa2/crypto/openssh/regress/unittests/conversion/
     - copied from r322416, head/crypto/openssh/regress/unittests/conversion/
  projects/numa2/share/vt/keymaps/tr.f.kbd
     - copied unchanged from r322416, head/share/vt/keymaps/tr.f.kbd
  projects/numa2/sys/arm/conf/GENERIC-NODEBUG
     - copied unchanged from r322416, head/sys/arm/conf/GENERIC-NODEBUG
  projects/numa2/sys/arm/freescale/imx/imx6_ahci.c
     - copied unchanged from r322416, head/sys/arm/freescale/imx/imx6_ahci.c
  projects/numa2/sys/boot/efi/include/efi_driver_utils.h
     - copied unchanged from r322416, head/sys/boot/efi/include/efi_driver_utils.h
  projects/numa2/sys/boot/efi/include/efi_drivers.h
     - copied unchanged from r322416, head/sys/boot/efi/include/efi_drivers.h
  projects/numa2/sys/boot/efi/include/efizfs.h
     - copied unchanged from r322416, head/sys/boot/efi/include/efizfs.h
  projects/numa2/sys/boot/efi/libefi/devicename.c
     - copied unchanged from r322416, head/sys/boot/efi/libefi/devicename.c
  projects/numa2/sys/boot/efi/libefi/efi_driver_utils.c
     - copied unchanged from r322416, head/sys/boot/efi/libefi/efi_driver_utils.c
  projects/numa2/sys/boot/efi/libefi/efizfs.c
     - copied unchanged from r322416, head/sys/boot/efi/libefi/efizfs.c
  projects/numa2/sys/dev/cxgbe/cudbg/
     - copied from r322416, head/sys/dev/cxgbe/cudbg/
  projects/numa2/sys/dev/iicbus/isl12xx.c
     - copied unchanged from r322416, head/sys/dev/iicbus/isl12xx.c
  projects/numa2/sys/modules/i2c/ds1307/
     - copied from r322416, head/sys/modules/i2c/ds1307/
  projects/numa2/sys/modules/i2c/ds3231/
     - copied from r322416, head/sys/modules/i2c/ds3231/
  projects/numa2/sys/modules/i2c/isl12xx/
     - copied from r322416, head/sys/modules/i2c/isl12xx/
  projects/numa2/sys/modules/i2c/nxprtc/
     - copied from r322416, head/sys/modules/i2c/nxprtc/
Deleted:
  projects/numa2/contrib/jemalloc/src/spin.c
  projects/numa2/crypto/openssh/auth1.c
  projects/numa2/sys/boot/efi/loader/devicename.c
  projects/numa2/sys/boot/fdt/dts/riscv/
  projects/numa2/sys/riscv/conf/LOWRISC
  projects/numa2/sys/riscv/conf/LOWRISC.hints
  projects/numa2/sys/riscv/conf/QEMU
  projects/numa2/sys/riscv/conf/ROCKET
  projects/numa2/sys/riscv/conf/SPIKE
  projects/numa2/sys/riscv/riscv/sbi.S
  projects/numa2/sys/sys/ksyms.h
Modified:
  projects/numa2/Makefile.inc1
  projects/numa2/Makefile.libcompat
  projects/numa2/ObsoleteFiles.inc
  projects/numa2/UPDATING
  projects/numa2/bin/cat/Makefile
  projects/numa2/bin/cat/cat.c
  projects/numa2/bin/chmod/tests/chmod_test.sh
  projects/numa2/bin/date/Makefile
  projects/numa2/bin/dd/Makefile
  projects/numa2/bin/df/df.1
  projects/numa2/bin/df/df.c
  projects/numa2/bin/echo/Makefile
  projects/numa2/bin/expr/Makefile
  projects/numa2/bin/ln/Makefile
  projects/numa2/bin/ls/Makefile
  projects/numa2/bin/mv/Makefile
  projects/numa2/bin/pax/Makefile
  projects/numa2/bin/pkill/Makefile
  projects/numa2/bin/pkill/pkill.c
  projects/numa2/bin/sh/Makefile
  projects/numa2/bin/sleep/Makefile
  projects/numa2/bin/test/Makefile
  projects/numa2/cddl/Makefile
  projects/numa2/cddl/contrib/opensolaris/cmd/lockstat/sym.c
  projects/numa2/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
  projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/numa2/cddl/lib/Makefile
  projects/numa2/cddl/sbin/Makefile
  projects/numa2/cddl/usr.bin/Makefile
  projects/numa2/cddl/usr.sbin/Makefile
  projects/numa2/contrib/compiler-rt/lib/builtins/int_lib.h
  projects/numa2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
  projects/numa2/contrib/elftoolchain/libelf/_libelf_config.h
  projects/numa2/contrib/ipfilter/tools/ippool.c
  projects/numa2/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
  projects/numa2/contrib/jemalloc/include/jemalloc/internal/spin.h
  projects/numa2/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
  projects/numa2/contrib/libc++/include/__bsd_locale_defaults.h
  projects/numa2/contrib/libc++/include/__bsd_locale_fallbacks.h
  projects/numa2/contrib/libc++/include/__locale
  projects/numa2/contrib/libc++/include/mutex
  projects/numa2/contrib/libc++/include/sstream
  projects/numa2/contrib/libxo/Makefile.am
  projects/numa2/contrib/libxo/configure.ac
  projects/numa2/contrib/libxo/doc/libxo-manual.html
  projects/numa2/contrib/libxo/libxo/libxo.3
  projects/numa2/contrib/libxo/libxo/libxo.c
  projects/numa2/contrib/libxo/libxo/xo_attr.3
  projects/numa2/contrib/libxo/libxo/xo_create.3
  projects/numa2/contrib/libxo/libxo/xo_emit.3
  projects/numa2/contrib/libxo/libxo/xo_emit_err.3
  projects/numa2/contrib/libxo/libxo/xo_emit_f.3
  projects/numa2/contrib/libxo/libxo/xo_err.3
  projects/numa2/contrib/libxo/libxo/xo_error.3
  projects/numa2/contrib/libxo/libxo/xo_finish.3
  projects/numa2/contrib/libxo/libxo/xo_flush.3
  projects/numa2/contrib/libxo/libxo/xo_format.5
  projects/numa2/contrib/libxo/libxo/xo_message.3
  projects/numa2/contrib/libxo/libxo/xo_no_setlocale.3
  projects/numa2/contrib/libxo/libxo/xo_open_container.3
  projects/numa2/contrib/libxo/libxo/xo_open_list.3
  projects/numa2/contrib/libxo/libxo/xo_open_marker.3
  projects/numa2/contrib/libxo/libxo/xo_options.7
  projects/numa2/contrib/libxo/libxo/xo_parse_args.3
  projects/numa2/contrib/libxo/libxo/xo_set_allocator.3
  projects/numa2/contrib/libxo/libxo/xo_set_flags.3
  projects/numa2/contrib/libxo/libxo/xo_set_info.3
  projects/numa2/contrib/libxo/libxo/xo_set_options.3
  projects/numa2/contrib/libxo/libxo/xo_set_style.3
  projects/numa2/contrib/libxo/libxo/xo_set_syslog_enterprise_id.3
  projects/numa2/contrib/libxo/libxo/xo_set_version.3
  projects/numa2/contrib/libxo/libxo/xo_set_writer.3
  projects/numa2/contrib/libxo/libxo/xo_syslog.3
  projects/numa2/contrib/libxo/tests/core/saved/test_01.E.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.H.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.HIPx.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.HP.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.J.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.JP.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.T.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.X.out
  projects/numa2/contrib/libxo/tests/core/saved/test_01.XP.out
  projects/numa2/contrib/libxo/tests/core/saved/test_02.E.out
  projects/numa2/contrib/libxo/tests/core/saved/test_02.J.out
  projects/numa2/contrib/libxo/tests/core/saved/test_02.JP.out
  projects/numa2/contrib/libxo/tests/core/saved/test_02.X.out
  projects/numa2/contrib/libxo/tests/core/saved/test_02.XP.out
  projects/numa2/contrib/libxo/tests/core/test_01.c
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.H.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.HIPx.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.HP.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.J.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.JP.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.T.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.X.out
  projects/numa2/contrib/libxo/tests/xo/saved/xo_01.XP.out
  projects/numa2/contrib/libxo/tests/xo/xo_01.sh
  projects/numa2/contrib/libxo/xo/xo.1
  projects/numa2/contrib/libxo/xohtml/xohtml.1
  projects/numa2/contrib/libxo/xohtml/xohtml.sh.in
  projects/numa2/contrib/libxo/xolint/xolint.1
  projects/numa2/contrib/libxo/xopo/xopo.1
  projects/numa2/contrib/llvm/include/llvm/Analysis/ValueTracking.h
  projects/numa2/contrib/llvm/include/llvm/CodeGen/MachineFunction.h
  projects/numa2/contrib/llvm/include/llvm/CodeGen/MachineInstr.h
  projects/numa2/contrib/llvm/lib/Analysis/ValueTracking.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/BranchFolding.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/MachineFunction.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/MachineInstr.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/ScheduleDAGInstrs.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  projects/numa2/contrib/llvm/lib/CodeGen/StackColoring.cpp
  projects/numa2/contrib/llvm/lib/IR/ConstantFold.cpp
  projects/numa2/contrib/llvm/lib/Object/COFFImportFile.cpp
  projects/numa2/contrib/llvm/lib/Target/AArch64/AArch64ExpandPseudoInsts.cpp
  projects/numa2/contrib/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp
  projects/numa2/contrib/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
  projects/numa2/contrib/llvm/lib/Target/AArch64/AArch64InstrInfo.td
  projects/numa2/contrib/llvm/lib/Target/AArch64/AArch64MacroFusion.cpp
  projects/numa2/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  projects/numa2/contrib/llvm/lib/Target/X86/X86InstrSSE.td
  projects/numa2/contrib/llvm/lib/Transforms/IPO/ArgumentPromotion.cpp
  projects/numa2/contrib/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
  projects/numa2/contrib/llvm/lib/Transforms/Scalar/SCCP.cpp
  projects/numa2/contrib/llvm/lib/Transforms/Utils/CloneModule.cpp
  projects/numa2/contrib/llvm/projects/libunwind/include/__libunwind_config.h
  projects/numa2/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
  projects/numa2/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
  projects/numa2/contrib/llvm/projects/libunwind/src/config.h
  projects/numa2/contrib/llvm/projects/libunwind/src/libunwind.cpp
  projects/numa2/contrib/llvm/tools/clang/include/clang/AST/StmtCXX.h
  projects/numa2/contrib/llvm/tools/clang/include/clang/Basic/BuiltinsX86.def
  projects/numa2/contrib/llvm/tools/clang/include/clang/Driver/Options.td
  projects/numa2/contrib/llvm/tools/clang/include/clang/Serialization/ASTBitCodes.h
  projects/numa2/contrib/llvm/tools/clang/lib/AST/ODRHash.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/AST/StmtCXX.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Driver/ToolChains/Arch/Mips.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Driver/ToolChains/OpenBSD.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Headers/avx2intrin.h
  projects/numa2/contrib/llvm/tools/clang/lib/Headers/avx512fintrin.h
  projects/numa2/contrib/llvm/tools/clang/lib/Headers/avxintrin.h
  projects/numa2/contrib/llvm/tools/clang/lib/Headers/float.h
  projects/numa2/contrib/llvm/tools/clang/lib/Sema/Sema.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Serialization/ASTReaderStmt.cpp
  projects/numa2/contrib/llvm/tools/clang/lib/Serialization/ASTWriterStmt.cpp
  projects/numa2/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-i386/ABISysV_i386.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/NetBSD/PlatformNetBSD.h
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Platform/OpenBSD/PlatformOpenBSD.h
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/POSIXStopInfo.h
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
  projects/numa2/contrib/llvm/tools/lldb/source/Target/Platform.cpp
  projects/numa2/contrib/mdocml/INSTALL
  projects/numa2/contrib/mdocml/LICENSE
  projects/numa2/contrib/mdocml/Makefile
  projects/numa2/contrib/mdocml/Makefile.depend
  projects/numa2/contrib/mdocml/NEWS
  projects/numa2/contrib/mdocml/TODO
  projects/numa2/contrib/mdocml/apropos.1
  projects/numa2/contrib/mdocml/att.c
  projects/numa2/contrib/mdocml/cgi.c
  projects/numa2/contrib/mdocml/chars.c
  projects/numa2/contrib/mdocml/config.h
  projects/numa2/contrib/mdocml/configure
  projects/numa2/contrib/mdocml/configure.local.example
  projects/numa2/contrib/mdocml/demandoc.c
  projects/numa2/contrib/mdocml/eqn.7
  projects/numa2/contrib/mdocml/eqn.c
  projects/numa2/contrib/mdocml/eqn_html.c
  projects/numa2/contrib/mdocml/eqn_term.c
  projects/numa2/contrib/mdocml/gmdiff
  projects/numa2/contrib/mdocml/html.c
  projects/numa2/contrib/mdocml/html.h
  projects/numa2/contrib/mdocml/lib.c
  projects/numa2/contrib/mdocml/libmandoc.h
  projects/numa2/contrib/mdocml/libroff.h
  projects/numa2/contrib/mdocml/main.c
  projects/numa2/contrib/mdocml/man.7
  projects/numa2/contrib/mdocml/man.c
  projects/numa2/contrib/mdocml/man.options.1
  projects/numa2/contrib/mdocml/man_html.c
  projects/numa2/contrib/mdocml/man_macro.c
  projects/numa2/contrib/mdocml/man_term.c
  projects/numa2/contrib/mdocml/man_validate.c
  projects/numa2/contrib/mdocml/manconf.h
  projects/numa2/contrib/mdocml/mandoc.1
  projects/numa2/contrib/mdocml/mandoc.3
  projects/numa2/contrib/mdocml/mandoc.c
  projects/numa2/contrib/mdocml/mandoc.css
  projects/numa2/contrib/mdocml/mandoc.h
  projects/numa2/contrib/mdocml/mandoc_aux.c
  projects/numa2/contrib/mdocml/mandoc_aux.h
  projects/numa2/contrib/mdocml/mandoc_char.7
  projects/numa2/contrib/mdocml/mandoc_escape.3
  projects/numa2/contrib/mdocml/mandoc_headers.3
  projects/numa2/contrib/mdocml/mandoc_html.3
  projects/numa2/contrib/mdocml/mandocd.c
  projects/numa2/contrib/mdocml/mandocdb.c
  projects/numa2/contrib/mdocml/manpath.c
  projects/numa2/contrib/mdocml/mansearch.c
  projects/numa2/contrib/mdocml/mdoc.7
  projects/numa2/contrib/mdocml/mdoc.c
  projects/numa2/contrib/mdocml/mdoc_html.c
  projects/numa2/contrib/mdocml/mdoc_man.c
  projects/numa2/contrib/mdocml/mdoc_markdown.c
  projects/numa2/contrib/mdocml/mdoc_term.c
  projects/numa2/contrib/mdocml/mdoc_validate.c
  projects/numa2/contrib/mdocml/msec.in
  projects/numa2/contrib/mdocml/out.c
  projects/numa2/contrib/mdocml/out.h
  projects/numa2/contrib/mdocml/read.c
  projects/numa2/contrib/mdocml/roff.7
  projects/numa2/contrib/mdocml/roff.c
  projects/numa2/contrib/mdocml/roff.h
  projects/numa2/contrib/mdocml/roff_html.c
  projects/numa2/contrib/mdocml/roff_int.h
  projects/numa2/contrib/mdocml/roff_term.c
  projects/numa2/contrib/mdocml/roff_validate.c
  projects/numa2/contrib/mdocml/soelim.1
  projects/numa2/contrib/mdocml/st.c
  projects/numa2/contrib/mdocml/st.in
  projects/numa2/contrib/mdocml/tbl.7
  projects/numa2/contrib/mdocml/tbl.c
  projects/numa2/contrib/mdocml/tbl_data.c
  projects/numa2/contrib/mdocml/tbl_html.c
  projects/numa2/contrib/mdocml/tbl_layout.c
  projects/numa2/contrib/mdocml/tbl_term.c
  projects/numa2/contrib/mdocml/term.c
  projects/numa2/contrib/mdocml/term.h
  projects/numa2/contrib/mdocml/term_ascii.c
  projects/numa2/contrib/mdocml/term_tab.c
  projects/numa2/contrib/mdocml/tree.c
  projects/numa2/contrib/netbsd-tests/lib/libc/gen/t_dir.c
  projects/numa2/contrib/netbsd-tests/lib/libc/regex/data/repet_bounded.in
  projects/numa2/contrib/netbsd-tests/lib/libc/regex/data/repet_multi.in
  projects/numa2/contrib/netbsd-tests/lib/libc/sys/t_mlock.c
  projects/numa2/contrib/ofed/usr.bin/Makefile
  projects/numa2/contrib/sqlite3/Makefile.msc
  projects/numa2/contrib/sqlite3/configure
  projects/numa2/contrib/sqlite3/configure.ac
  projects/numa2/contrib/sqlite3/shell.c
  projects/numa2/contrib/sqlite3/sqlite3.c
  projects/numa2/contrib/sqlite3/sqlite3.h
  projects/numa2/contrib/sqlite3/sqlite3ext.h
  projects/numa2/contrib/sqlite3/tea/configure
  projects/numa2/contrib/sqlite3/tea/configure.ac
  projects/numa2/contrib/sqlite3/tea/generic/tclsqlite3.c
  projects/numa2/contrib/subversion/CHANGES
  projects/numa2/contrib/subversion/NOTICE
  projects/numa2/contrib/subversion/build-outputs.mk
  projects/numa2/contrib/subversion/configure
  projects/numa2/contrib/subversion/subversion/include/svn_version.h
  projects/numa2/contrib/subversion/subversion/libsvn_client/copy.c
  projects/numa2/contrib/subversion/subversion/libsvn_client/merge.c
  projects/numa2/contrib/subversion/subversion/libsvn_fs_fs/cached_data.c
  projects/numa2/contrib/subversion/subversion/libsvn_fs_fs/cached_data.h
  projects/numa2/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  projects/numa2/contrib/subversion/subversion/libsvn_fs_fs/rep-cache.c
  projects/numa2/contrib/subversion/subversion/libsvn_fs_fs/transaction.c
  projects/numa2/contrib/subversion/subversion/libsvn_fs_x/rep-cache-db.h
  projects/numa2/contrib/subversion/subversion/libsvn_ra_svn/client.c
  projects/numa2/contrib/subversion/subversion/libsvn_repos/dump.c
  projects/numa2/contrib/subversion/subversion/libsvn_subr/config_file.c
  projects/numa2/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  projects/numa2/contrib/subversion/subversion/libsvn_subr/io.c
  projects/numa2/contrib/subversion/subversion/libsvn_subr/version.c
  projects/numa2/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  projects/numa2/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  projects/numa2/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  projects/numa2/contrib/subversion/subversion/svnadmin/svnadmin.c
  projects/numa2/contrib/subversion/win-tests.py
  projects/numa2/contrib/top/machine.h
  projects/numa2/contrib/top/top.c
  projects/numa2/contrib/top/top.xs
  projects/numa2/contrib/zstd/lib/common/xxhash.c
  projects/numa2/crypto/openssh/ChangeLog
  projects/numa2/crypto/openssh/INSTALL
  projects/numa2/crypto/openssh/Makefile.in
  projects/numa2/crypto/openssh/README
  projects/numa2/crypto/openssh/auth-pam.c
  projects/numa2/crypto/openssh/auth2-pubkey.c
  projects/numa2/crypto/openssh/auth2.c
  projects/numa2/crypto/openssh/channels.c
  projects/numa2/crypto/openssh/channels.h
  projects/numa2/crypto/openssh/clientloop.c
  projects/numa2/crypto/openssh/compat.c
  projects/numa2/crypto/openssh/config.h
  projects/numa2/crypto/openssh/configure.ac
  projects/numa2/crypto/openssh/contrib/cygwin/ssh-host-config
  projects/numa2/crypto/openssh/contrib/redhat/openssh.spec
  projects/numa2/crypto/openssh/contrib/suse/openssh.spec
  projects/numa2/crypto/openssh/digest-openssl.c
  projects/numa2/crypto/openssh/freebsd-configure.sh
  projects/numa2/crypto/openssh/hostfile.c
  projects/numa2/crypto/openssh/kex.c
  projects/numa2/crypto/openssh/krl.c
  projects/numa2/crypto/openssh/log.c
  projects/numa2/crypto/openssh/match.c
  projects/numa2/crypto/openssh/match.h
  projects/numa2/crypto/openssh/misc.c
  projects/numa2/crypto/openssh/monitor.c
  projects/numa2/crypto/openssh/mux.c
  projects/numa2/crypto/openssh/openbsd-compat/bsd-misc.c
  projects/numa2/crypto/openssh/openbsd-compat/bsd-misc.h
  projects/numa2/crypto/openssh/openbsd-compat/fmt_scaled.c
  projects/numa2/crypto/openssh/packet.c
  projects/numa2/crypto/openssh/packet.h
  projects/numa2/crypto/openssh/pathnames.h
  projects/numa2/crypto/openssh/readconf.c
  projects/numa2/crypto/openssh/regress/Makefile
  projects/numa2/crypto/openssh/regress/agent-getpeereid.sh
  projects/numa2/crypto/openssh/regress/allow-deny-users.sh
  projects/numa2/crypto/openssh/regress/cert-file.sh
  projects/numa2/crypto/openssh/regress/forwarding.sh
  projects/numa2/crypto/openssh/regress/integrity.sh
  projects/numa2/crypto/openssh/regress/test-exec.sh
  projects/numa2/crypto/openssh/regress/unittests/Makefile
  projects/numa2/crypto/openssh/regress/unittests/match/tests.c
  projects/numa2/crypto/openssh/regress/unittests/test_helper/test_helper.c
  projects/numa2/crypto/openssh/regress/unittests/test_helper/test_helper.h
  projects/numa2/crypto/openssh/regress/unittests/utf8/tests.c
  projects/numa2/crypto/openssh/sandbox-seccomp-filter.c
  projects/numa2/crypto/openssh/servconf.c
  projects/numa2/crypto/openssh/serverloop.c
  projects/numa2/crypto/openssh/session.c
  projects/numa2/crypto/openssh/sftp-client.c
  projects/numa2/crypto/openssh/sftp.c
  projects/numa2/crypto/openssh/ssh-agent.c
  projects/numa2/crypto/openssh/ssh-keygen.c
  projects/numa2/crypto/openssh/ssh-keyscan.c
  projects/numa2/crypto/openssh/ssh.c
  projects/numa2/crypto/openssh/ssh_config
  projects/numa2/crypto/openssh/ssh_config.5
  projects/numa2/crypto/openssh/ssh_namespace.h
  projects/numa2/crypto/openssh/sshconnect.c
  projects/numa2/crypto/openssh/sshconnect1.c
  projects/numa2/crypto/openssh/sshconnect2.c
  projects/numa2/crypto/openssh/sshd.8
  projects/numa2/crypto/openssh/sshd.c
  projects/numa2/crypto/openssh/sshd_config
  projects/numa2/crypto/openssh/sshd_config.5
  projects/numa2/crypto/openssh/sshkey.c
  projects/numa2/crypto/openssh/sshkey.h
  projects/numa2/crypto/openssh/utf8.c
  projects/numa2/crypto/openssh/version.h
  projects/numa2/gnu/Makefile
  projects/numa2/kerberos5/lib/libkafs5/Makefile
  projects/numa2/kerberos5/libexec/ipropd-master/Makefile
  projects/numa2/lib/atf/Makefile
  projects/numa2/lib/atf/libatf-c++/Makefile
  projects/numa2/lib/atf/libatf-c/Makefile
  projects/numa2/lib/clang/include/clang/Basic/Version.inc
  projects/numa2/lib/clang/include/lld/Config/Version.inc
  projects/numa2/lib/clang/include/llvm/Support/VCSRevision.h
  projects/numa2/lib/csu/riscv/crt1.c
  projects/numa2/lib/csu/riscv/crti.S
  projects/numa2/lib/libarchive/Makefile
  projects/numa2/lib/libc/Makefile
  projects/numa2/lib/libc/gen/fnmatch.c
  projects/numa2/lib/libc/gen/tls.c
  projects/numa2/lib/libc/regex/engine.c
  projects/numa2/lib/libc/regex/regcomp.c
  projects/numa2/lib/libc/riscv/gen/fabs.S
  projects/numa2/lib/libc/stdlib/jemalloc/Makefile.inc
  projects/numa2/lib/libc/tests/gen/fnmatch_testcases.h
  projects/numa2/lib/libcapsicum/capsicum_helpers.h
  projects/numa2/lib/libcasper/services/cap_dns/Makefile
  projects/numa2/lib/libcasper/services/cap_grp/Makefile
  projects/numa2/lib/libcasper/services/cap_pwd/Makefile
  projects/numa2/lib/libcasper/services/cap_sysctl/Makefile
  projects/numa2/lib/libcrypt/Makefile
  projects/numa2/lib/libmp/Makefile
  projects/numa2/lib/libnv/Makefile
  projects/numa2/lib/libpathconv/Makefile
  projects/numa2/lib/libproc/Makefile
  projects/numa2/lib/libproc/proc_bkpt.c
  projects/numa2/lib/libproc/proc_regs.c
  projects/numa2/lib/librt/Makefile
  projects/numa2/lib/libstand/Makefile
  projects/numa2/lib/libthr/Makefile
  projects/numa2/lib/libusb/libusb.h
  projects/numa2/lib/libusb/libusb10_desc.c
  projects/numa2/lib/libutil/Makefile
  projects/numa2/lib/libutil/flopen.3
  projects/numa2/lib/libutil/flopen.c
  projects/numa2/lib/libutil/libutil.h
  projects/numa2/lib/libutil/pidfile.c
  projects/numa2/lib/libxo/Makefile
  projects/numa2/lib/libxo/add.man
  projects/numa2/lib/libxo/tests/Makefile
  projects/numa2/lib/libxo/xo_config.h
  projects/numa2/lib/msun/Makefile
  projects/numa2/libexec/atf/atf-check/Makefile
  projects/numa2/libexec/atf/atf-sh/Makefile
  projects/numa2/libexec/rtld-elf/Makefile
  projects/numa2/libexec/rtld-elf/riscv/reloc.c
  projects/numa2/libexec/rtld-elf/rtld.c
  projects/numa2/release/packages/kernel.ucl
  projects/numa2/release/packages/runtime.ucl
  projects/numa2/sbin/devd/Makefile
  projects/numa2/sbin/dhclient/Makefile
  projects/numa2/sbin/fsck_ffs/setup.c
  projects/numa2/sbin/growfs/Makefile
  projects/numa2/sbin/ifconfig/Makefile
  projects/numa2/sbin/ifconfig/af_link.c
  projects/numa2/sbin/ifconfig/ifconfig.c
  projects/numa2/sbin/mdconfig/Makefile
  projects/numa2/sbin/newfs/mkfs.c
  projects/numa2/sbin/pfctl/Makefile
  projects/numa2/secure/Makefile
  projects/numa2/secure/lib/Makefile
  projects/numa2/secure/libexec/Makefile
  projects/numa2/secure/usr.bin/Makefile
  projects/numa2/secure/usr.sbin/Makefile
  projects/numa2/share/Makefile
  projects/numa2/share/examples/Makefile
  projects/numa2/share/examples/ppp/ppp.conf.sample
  projects/numa2/share/man/man3/makedev.3
  projects/numa2/share/man/man4/ehci.4
  projects/numa2/share/man/man4/enc.4
  projects/numa2/share/man/man4/geom.4
  projects/numa2/share/man/man4/geom_fox.4
  projects/numa2/share/man/man4/ksyms.4
  projects/numa2/share/man/man4/linux.4
  projects/numa2/share/man/man4/ohci.4
  projects/numa2/share/man/man4/ucom.4
  projects/numa2/share/man/man4/ugen.4
  projects/numa2/share/man/man4/uhci.4
  projects/numa2/share/man/man4/uhid.4
  projects/numa2/share/man/man4/ukbd.4
  projects/numa2/share/man/man4/ums.4
  projects/numa2/share/man/man4/uplcom.4
  projects/numa2/share/man/man4/usb.4
  projects/numa2/share/man/man4/xhci.4
  projects/numa2/share/man/man5/fdescfs.5
  projects/numa2/share/man/man5/src.conf.5
  projects/numa2/share/man/man7/arch.7
  projects/numa2/share/man/man9/disk.9
  projects/numa2/share/misc/organization.dot
  projects/numa2/share/misc/pci_vendors
  projects/numa2/share/mk/bsd.compiler.mk
  projects/numa2/share/mk/bsd.cpu.mk
  projects/numa2/share/mk/bsd.opts.mk
  projects/numa2/share/mk/bsd.own.mk
  projects/numa2/share/mk/bsd.stand.mk
  projects/numa2/share/mk/src.opts.mk
  projects/numa2/share/vt/keymaps/INDEX.keymaps
  projects/numa2/share/vt/keymaps/Makefile
  projects/numa2/share/zoneinfo/Makefile
  projects/numa2/sys/amd64/amd64/efirt.c   (contents, props changed)
  projects/numa2/sys/amd64/amd64/elf_machdep.c
  projects/numa2/sys/amd64/amd64/initcpu.c
  projects/numa2/sys/amd64/amd64/machdep.c
  projects/numa2/sys/amd64/amd64/pmap.c
  projects/numa2/sys/amd64/amd64/trap.c
  projects/numa2/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  projects/numa2/sys/amd64/include/cpufunc.h
  projects/numa2/sys/amd64/include/efi.h
  projects/numa2/sys/amd64/include/md_var.h
  projects/numa2/sys/amd64/linux/linux_sysvec.c
  projects/numa2/sys/arm/allwinner/aw_ccu.c
  projects/numa2/sys/arm/allwinner/axp209.c
  projects/numa2/sys/arm/allwinner/clk/aw_modclk.c
  projects/numa2/sys/arm/allwinner/clkng/aw_ccung.c
  projects/numa2/sys/arm/arm/generic_timer.c
  projects/numa2/sys/arm/at91/at91_pmc.c
  projects/numa2/sys/arm/conf/GENERIC
  projects/numa2/sys/arm/conf/IMX6
  projects/numa2/sys/arm/conf/NOTES
  projects/numa2/sys/arm/freescale/imx/files.imx6
  projects/numa2/sys/arm/freescale/imx/imx6_ccm.c
  projects/numa2/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/numa2/sys/arm/freescale/imx/imx_ccmvar.h
  projects/numa2/sys/arm/freescale/imx/imx_iomux.c
  projects/numa2/sys/arm/freescale/imx/imx_iomuxreg.h
  projects/numa2/sys/arm/freescale/imx/imx_iomuxvar.h
  projects/numa2/sys/arm/freescale/imx/std.imx6
  projects/numa2/sys/arm/mv/armada38x/armada38x_pl310.c
  projects/numa2/sys/arm/mv/mv_machdep.c
  projects/numa2/sys/arm/ti/am335x/am335x_prcm.c
  projects/numa2/sys/arm64/arm64/gic_v3.c
  projects/numa2/sys/arm64/arm64/gic_v3_fdt.c
  projects/numa2/sys/arm64/arm64/gic_v3_var.h
  projects/numa2/sys/arm64/arm64/gicv3_its.c
  projects/numa2/sys/arm64/arm64/mp_machdep.c
  projects/numa2/sys/arm64/conf/GENERIC
  projects/numa2/sys/arm64/include/param.h
  projects/numa2/sys/boot/efi/include/efilib.h
  projects/numa2/sys/boot/efi/include/efiprot.h
  projects/numa2/sys/boot/efi/libefi/Makefile
  projects/numa2/sys/boot/efi/libefi/errno.c
  projects/numa2/sys/boot/efi/libefi/time.c
  projects/numa2/sys/boot/efi/loader/Makefile
  projects/numa2/sys/boot/efi/loader/loader_efi.h
  projects/numa2/sys/boot/efi/loader/main.c
  projects/numa2/sys/boot/fdt/dts/arm/armada-385-db-ap.dts
  projects/numa2/sys/boot/fdt/dts/arm/armada-388-gp.dts
  projects/numa2/sys/boot/fdt/dts/arm/armada-38x-solidrun-microsom.dtsi
  projects/numa2/sys/boot/fdt/dts/arm/armada-38x.dtsi
  projects/numa2/sys/boot/fdt/dts/arm/nanopi-neo.dts
  projects/numa2/sys/boot/geli/Makefile
  projects/numa2/sys/boot/i386/boot2/Makefile
  projects/numa2/sys/boot/zfs/zfsimpl.c
  projects/numa2/sys/cam/ctl/scsi_ctl.c
  projects/numa2/sys/cam/nvme/nvme_da.c
  projects/numa2/sys/cddl/compat/opensolaris/sys/atomic.h
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/numa2/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/numa2/sys/cddl/dev/profile/profile.c
  projects/numa2/sys/compat/linuxkpi/common/include/linux/cdev.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/completion.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/device.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/fs.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/hrtimer.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/jiffies.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/kdev_t.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/page.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/pci.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/sched.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/sysfs.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/timer.h
  projects/numa2/sys/compat/linuxkpi/common/include/linux/wait.h
  projects/numa2/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/numa2/sys/compat/linuxkpi/common/src/linux_hrtimer.c
  projects/numa2/sys/compat/linuxkpi/common/src/linux_page.c
  projects/numa2/sys/compat/linuxkpi/common/src/linux_pci.c
  projects/numa2/sys/compat/linuxkpi/common/src/linux_schedule.c
  projects/numa2/sys/compat/linuxkpi/common/src/linux_work.c
  projects/numa2/sys/conf/Makefile.riscv
  projects/numa2/sys/conf/NOTES
  projects/numa2/sys/conf/files
  projects/numa2/sys/conf/files.amd64
  projects/numa2/sys/conf/files.arm64
  projects/numa2/sys/conf/files.riscv
  projects/numa2/sys/conf/kern.mk
  projects/numa2/sys/conf/options.arm64
  projects/numa2/sys/contrib/ena-com/ena_plat.h
  projects/numa2/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/numa2/sys/dev/ahci/ahci_pci.c
  projects/numa2/sys/dev/ata/ata-pci.h
  projects/numa2/sys/dev/ata/chipsets/ata-intel.c
  projects/numa2/sys/dev/cxgbe/common/common.h
  projects/numa2/sys/dev/cxgbe/common/t4_hw.h
  projects/numa2/sys/dev/cxgbe/t4_ioctl.h
  projects/numa2/sys/dev/cxgbe/t4_main.c
  projects/numa2/sys/dev/cxgbe/t4_sched.c
  projects/numa2/sys/dev/cyapa/cyapa.c
  projects/numa2/sys/dev/e1000/if_em.h
  projects/numa2/sys/dev/efidev/efidev.c
  projects/numa2/sys/dev/fdt/fdt_common.c
  projects/numa2/sys/dev/hwpmc/hwpmc_piv.c
  projects/numa2/sys/dev/hyperv/netvsc/if_hn.c
  projects/numa2/sys/dev/hyperv/netvsc/if_hnreg.h
  projects/numa2/sys/dev/hyperv/netvsc/if_hnvar.h
  projects/numa2/sys/dev/hyperv/utilities/hv_kvp.c
  projects/numa2/sys/dev/ichwd/ichwd.c
  projects/numa2/sys/dev/iicbus/ds1307.c
  projects/numa2/sys/dev/iicbus/ds3231.c
  projects/numa2/sys/dev/iicbus/ds3231reg.h
  projects/numa2/sys/dev/ksyms/ksyms.c
  projects/numa2/sys/dev/mlx4/mlx4_en/en.h
  projects/numa2/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
  projects/numa2/sys/dev/mlx4/mlx4_en/mlx4_en_port.c
  projects/numa2/sys/dev/mlx4/mlx4_en/mlx4_en_tx.c
  projects/numa2/sys/dev/mlx4/stats.h
  projects/numa2/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
  projects/numa2/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
  projects/numa2/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/numa2/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/numa2/sys/dev/mly/mly.c
  projects/numa2/sys/dev/mmc/bridge.h
  projects/numa2/sys/dev/mmc/mmc.c
  projects/numa2/sys/dev/mmc/mmc_subr.c
  projects/numa2/sys/dev/mmc/mmc_subr.h
  projects/numa2/sys/dev/mmc/mmcbus_if.m
  projects/numa2/sys/dev/mmc/mmcreg.h
  projects/numa2/sys/dev/mmc/mmcsd.c
  projects/numa2/sys/dev/mmc/mmcvar.h
  projects/numa2/sys/dev/mpr/mpr.c
  projects/numa2/sys/dev/mpr/mpr_config.c
  projects/numa2/sys/dev/mpr/mpr_sas.c
  projects/numa2/sys/dev/mpr/mpr_sas_lsi.c
  projects/numa2/sys/dev/mpr/mpr_user.c
  projects/numa2/sys/dev/mpr/mprvar.h
  projects/numa2/sys/dev/mps/mps.c
  projects/numa2/sys/dev/mps/mps_config.c
  projects/numa2/sys/dev/mps/mps_sas.c
  projects/numa2/sys/dev/mps/mps_sas_lsi.c
  projects/numa2/sys/dev/mps/mps_user.c
  projects/numa2/sys/dev/mps/mpsvar.h
  projects/numa2/sys/dev/nvd/nvd.c
  projects/numa2/sys/dev/nvme/nvme.h
  projects/numa2/sys/dev/nvme/nvme_sim.c
  projects/numa2/sys/dev/nvme/nvme_sysctl.c
  projects/numa2/sys/dev/ofw/ofw_bus_subr.c
  projects/numa2/sys/dev/ofw/ofw_fdt.c
  projects/numa2/sys/dev/pci/pci.c
  projects/numa2/sys/dev/qlnx/qlnxe/qlnx_def.h
  projects/numa2/sys/dev/qlnx/qlnxe/qlnx_os.c
  projects/numa2/sys/dev/qlnx/qlnxe/qlnx_ver.h
  projects/numa2/sys/dev/sound/pci/hda/hdac.c
  projects/numa2/sys/dev/sound/pci/hda/hdac.h
  projects/numa2/sys/dev/sym/sym_hipd.c
  projects/numa2/sys/dev/usb/controller/xhci_pci.c
  projects/numa2/sys/dev/xen/timer/timer.c
  projects/numa2/sys/fs/fdescfs/fdesc.h
  projects/numa2/sys/fs/fdescfs/fdesc_vfsops.c
  projects/numa2/sys/fs/fdescfs/fdesc_vnops.c
  projects/numa2/sys/fs/pseudofs/pseudofs.h
  projects/numa2/sys/geom/geom.h
  projects/numa2/sys/geom/geom_bsd.c
  projects/numa2/sys/geom/geom_dev.c
  projects/numa2/sys/geom/geom_disk.c
  projects/numa2/sys/geom/geom_disk.h
  projects/numa2/sys/geom/geom_dump.c
  projects/numa2/sys/geom/geom_fox.c
  projects/numa2/sys/geom/geom_mbr.c
  projects/numa2/sys/geom/geom_subr.c
  projects/numa2/sys/geom/geom_sunlabel.c
  projects/numa2/sys/geom/geom_vol_ffs.c
  projects/numa2/sys/geom/journal/g_journal.c
  projects/numa2/sys/geom/journal/g_journal.h
  projects/numa2/sys/geom/part/g_part.c
  projects/numa2/sys/i386/i386/machdep.c
  projects/numa2/sys/i386/i386/pmap.c
  projects/numa2/sys/i386/i386/trap.c
  projects/numa2/sys/i386/include/cpufunc.h
  projects/numa2/sys/i386/include/md_var.h
  projects/numa2/sys/isa/rtc.h
  projects/numa2/sys/kern/kern_sendfile.c
  projects/numa2/sys/kern/posix4_mib.c
  projects/numa2/sys/kern/subr_blist.c
  projects/numa2/sys/kern/subr_devmap.c
  projects/numa2/sys/kern/subr_intr.c
  projects/numa2/sys/kern/subr_witness.c
  projects/numa2/sys/kern/vfs_aio.c
  projects/numa2/sys/kern/vfs_bio.c
  projects/numa2/sys/kern/vfs_syscalls.c
  projects/numa2/sys/libkern/x86/crc32_sse42.c
  projects/numa2/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/numa2/sys/modules/dtb/allwinner/Makefile
  projects/numa2/sys/modules/dtrace/dtraceall/dtraceall.c
  projects/numa2/sys/modules/i2c/Makefile
  projects/numa2/sys/modules/qlnx/qlnxe/Makefile
  projects/numa2/sys/net/if_enc.c
  projects/numa2/sys/net/iflib.c
  projects/numa2/sys/net80211/ieee80211_ioctl.c
  projects/numa2/sys/net80211/ieee80211_mesh.c
  projects/numa2/sys/netinet/if_ether.c
  projects/numa2/sys/netinet/in.h
  projects/numa2/sys/netipsec/key.c
  projects/numa2/sys/netpfil/pf/pf_lb.c
  projects/numa2/sys/ofed/drivers/infiniband/core/addr.c
  projects/numa2/sys/ofed/drivers/infiniband/core/cm.c
  projects/numa2/sys/riscv/conf/GENERIC
  projects/numa2/sys/riscv/include/machdep.h
  projects/numa2/sys/riscv/include/riscvreg.h
  projects/numa2/sys/riscv/include/sbi.h
  projects/numa2/sys/riscv/riscv/cpufunc_asm.S
  projects/numa2/sys/riscv/riscv/exception.S
  projects/numa2/sys/riscv/riscv/intr_machdep.c
  projects/numa2/sys/riscv/riscv/locore.S
  projects/numa2/sys/riscv/riscv/machdep.c
  projects/numa2/sys/riscv/riscv/nexus.c
  projects/numa2/sys/riscv/riscv/pmap.c
  projects/numa2/sys/riscv/riscv/riscv_console.c
  projects/numa2/sys/riscv/riscv/swtch.S
  projects/numa2/sys/riscv/riscv/timer.c
  projects/numa2/sys/riscv/riscv/trap.c
  projects/numa2/sys/riscv/riscv/vm_machdep.c
  projects/numa2/sys/sparc64/sparc64/pmap.c
  projects/numa2/sys/sys/_termios.h
  projects/numa2/sys/sys/blist.h
  projects/numa2/sys/sys/cdefs.h
  projects/numa2/sys/sys/kerneldump.h
  projects/numa2/sys/sys/types.h
  projects/numa2/sys/sys/vnode.h
  projects/numa2/sys/ufs/ffs/ffs_snapshot.c
  projects/numa2/sys/ufs/ffs/fs.h
  projects/numa2/sys/vm/vm_glue.c
  projects/numa2/sys/vm/vm_kern.c
  projects/numa2/sys/vm/vm_page.c
  projects/numa2/sys/vm/vm_page.h
  projects/numa2/sys/x86/acpica/madt.c
  projects/numa2/sys/x86/acpica/srat.c
  projects/numa2/sys/x86/include/apicvar.h
  projects/numa2/sys/x86/include/x86_smp.h
  projects/numa2/sys/x86/include/x86_var.h
  projects/numa2/sys/x86/isa/atrtc.c
  projects/numa2/sys/x86/x86/identcpu.c
  projects/numa2/sys/x86/x86/local_apic.c
  projects/numa2/sys/x86/x86/mp_x86.c
  projects/numa2/sys/x86/x86/mptable.c
  projects/numa2/sys/x86/xen/pvcpu_enum.c
  projects/numa2/tests/sys/aio/lio_test.c
  projects/numa2/tests/sys/file/newfileops_on_fork_test.c
  projects/numa2/tests/sys/fs/tmpfs/Makefile
  projects/numa2/tests/sys/kern/ptrace_test.c
  projects/numa2/tests/sys/netinet/fibs_test.sh   (contents, props changed)
  projects/numa2/tools/build/mk/OptionalObsoleteFiles.inc
  projects/numa2/tools/tools/bootparttest/Makefile
  projects/numa2/tools/tools/bootparttest/bootparttest.c
  projects/numa2/tools/tools/bootparttest/stub.c
  projects/numa2/tools/tools/zfsboottest/Makefile
  projects/numa2/tools/tools/zfsboottest/zfsboottest.c
  projects/numa2/usr.bin/Makefile
  projects/numa2/usr.bin/apply/Makefile
  projects/numa2/usr.bin/basename/Makefile
  projects/numa2/usr.bin/bsdcat/Makefile
  projects/numa2/usr.bin/calendar/Makefile
  projects/numa2/usr.bin/calendar/calendars/calendar.freebsd
  projects/numa2/usr.bin/cmp/Makefile
  projects/numa2/usr.bin/col/Makefile
  projects/numa2/usr.bin/comm/Makefile
  projects/numa2/usr.bin/compress/Makefile
  projects/numa2/usr.bin/cpio/Makefile
  projects/numa2/usr.bin/csplit/Makefile
  projects/numa2/usr.bin/cut/Makefile
  projects/numa2/usr.bin/cut/cut.1
  projects/numa2/usr.bin/diff/Makefile
  projects/numa2/usr.bin/diff3/Makefile
  projects/numa2/usr.bin/dirname/Makefile
  projects/numa2/usr.bin/du/du.1
  projects/numa2/usr.bin/du/du.c
  projects/numa2/usr.bin/du/tests/du_test.sh
  projects/numa2/usr.bin/file2c/Makefile
  projects/numa2/usr.bin/getconf/Makefile
  projects/numa2/usr.bin/grep/Makefile
  projects/numa2/usr.bin/gzip/Makefile
  projects/numa2/usr.bin/hexdump/Makefile
  projects/numa2/usr.bin/ident/Makefile
  projects/numa2/usr.bin/indent/Makefile
  projects/numa2/usr.bin/indent/indent.1
  projects/numa2/usr.bin/indent/indent.c
  projects/numa2/usr.bin/join/Makefile
  projects/numa2/usr.bin/jot/Makefile
  projects/numa2/usr.bin/lastcomm/Makefile
  projects/numa2/usr.bin/ldd/ldd.c
  projects/numa2/usr.bin/limits/Makefile
  projects/numa2/usr.bin/m4/Makefile
  projects/numa2/usr.bin/mandoc/Makefile
  projects/numa2/usr.bin/mkimg/Makefile
  projects/numa2/usr.bin/mt/mt.1
  projects/numa2/usr.bin/ncal/Makefile
  projects/numa2/usr.bin/pr/Makefile
  projects/numa2/usr.bin/printf/Makefile
  projects/numa2/usr.bin/procstat/Makefile
  projects/numa2/usr.bin/procstat/procstat_ptlwpinfo.c
  projects/numa2/usr.bin/ruptime/ruptime.1
  projects/numa2/usr.bin/rwho/rwho.1
  projects/numa2/usr.bin/sdiff/Makefile
  projects/numa2/usr.bin/sed/Makefile
  projects/numa2/usr.bin/soelim/Makefile
  projects/numa2/usr.bin/tail/Makefile
  projects/numa2/usr.bin/tar/Makefile
  projects/numa2/usr.bin/timeout/Makefile
  projects/numa2/usr.bin/top/machine.c
  projects/numa2/usr.bin/tr/Makefile
  projects/numa2/usr.bin/truncate/Makefile
  projects/numa2/usr.bin/uniq/Makefile
  projects/numa2/usr.bin/units/Makefile
  projects/numa2/usr.bin/uudecode/Makefile
  projects/numa2/usr.bin/uuencode/Makefile
  projects/numa2/usr.bin/vmstat/vmstat.c
  projects/numa2/usr.bin/xargs/Makefile
  projects/numa2/usr.bin/xinstall/Makefile
  projects/numa2/usr.bin/xlint/lint1/param.h
  projects/numa2/usr.bin/xo/Makefile
  projects/numa2/usr.bin/xohtml/xohtml.sh
  projects/numa2/usr.bin/yacc/Makefile
  projects/numa2/usr.sbin/Makefile
  projects/numa2/usr.sbin/acpi/acpidump/acpi.c
  projects/numa2/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8
  projects/numa2/usr.sbin/bsdinstall/scripts/netconfig_ipv4
  projects/numa2/usr.sbin/chown/Makefile
  projects/numa2/usr.sbin/cxgbetool/cxgbetool.c
  projects/numa2/usr.sbin/etcupdate/Makefile
  projects/numa2/usr.sbin/extattr/Makefile
  projects/numa2/usr.sbin/fstyp/Makefile
  projects/numa2/usr.sbin/makefs/Makefile
  projects/numa2/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
  projects/numa2/usr.sbin/newsyslog/Makefile
  projects/numa2/usr.sbin/nmtree/Makefile
  projects/numa2/usr.sbin/pmcstat/pmcpl_gprof.c
  projects/numa2/usr.sbin/pw/Makefile
  projects/numa2/usr.sbin/rpcbind/Makefile
  projects/numa2/usr.sbin/rwhod/rwhod.8
  projects/numa2/usr.sbin/sa/Makefile
  projects/numa2/usr.sbin/tzsetup/tzsetup.c
  projects/numa2/usr.sbin/ypldap/entries.c
Directory Properties:
  projects/numa2/   (props changed)
  projects/numa2/cddl/   (props changed)
  projects/numa2/cddl/contrib/opensolaris/   (props changed)
  projects/numa2/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/numa2/contrib/compiler-rt/   (props changed)
  projects/numa2/contrib/elftoolchain/   (props changed)
  projects/numa2/contrib/ipfilter/   (props changed)
  projects/numa2/contrib/libc++/   (props changed)
  projects/numa2/contrib/libxo/   (props changed)
  projects/numa2/contrib/llvm/   (props changed)
  projects/numa2/contrib/llvm/projects/libunwind/   (props changed)
  projects/numa2/contrib/llvm/tools/clang/   (props changed)
  projects/numa2/contrib/llvm/tools/lld/   (props changed)
  projects/numa2/contrib/llvm/tools/lldb/   (props changed)
  projects/numa2/contrib/mdocml/   (props changed)
  projects/numa2/contrib/netbsd-tests/   (props changed)
  projects/numa2/contrib/sqlite3/   (props changed)
  projects/numa2/contrib/subversion/   (props changed)
  projects/numa2/contrib/top/   (props changed)
  projects/numa2/contrib/zstd/   (props changed)
  projects/numa2/crypto/openssh/   (props changed)
  projects/numa2/sys/cddl/contrib/opensolaris/   (props changed)
  projects/numa2/sys/contrib/ena-com/   (props changed)
  projects/numa2/sys/contrib/ipfilter/   (props changed)
  projects/numa2/tests/etc/rc.d/routing_test.sh   (props changed)
  projects/numa2/tests/sys/acl/aclfuzzer.sh   (props changed)
  projects/numa2/tests/sys/acl/mktrivial.sh   (props changed)
  projects/numa2/tests/sys/file/flock_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/eli/conf.sh   (props changed)
  projects/numa2/tests/sys/geom/class/eli/init_alias_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/gate/ggate_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/mirror/8_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/mirror/9_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/nop/nop_test.sh   (props changed)
  projects/numa2/tests/sys/geom/class/uzip/conf.sh   (props changed)
  projects/numa2/tests/sys/kern/coredump_phnum_test.sh   (props changed)
  projects/numa2/tests/sys/kqueue/libkqueue/kqueue_test.sh   (props changed)
  projects/numa2/tests/sys/mac/portacl/misc.sh   (props changed)
  projects/numa2/tests/sys/mac/portacl/nobody_test.sh   (props changed)
  projects/numa2/tests/sys/mac/portacl/root_test.sh   (props changed)
  projects/numa2/tests/sys/mqueue/mqueue_test.sh   (props changed)
  projects/numa2/tests/sys/opencrypto/runtests.sh   (props changed)
  projects/numa2/tests/sys/vfs/trailing_slash.sh   (props changed)

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

--- projects/numa2/Makefile.inc1	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/Makefile.inc1	Fri Aug 11 22:39:38 2017	(r322417)
@@ -346,6 +346,12 @@ SVN=   ${_P}/${_S}
 . endfor
 .endif
 SVNFLAGS?=	-r HEAD
+.if !defined(VCS_REVISION) && empty(VCS_REVISION)
+_VCS_REVISION?=	$$(eval ${SVNVERSION_CMD} ${SRCDIR})
+. if !empty(_VCS_REVISION)
+VCS_REVISION=	$$(echo r${_VCS_REVISION})
+. endif
+.endif
 
 .if !defined(OSRELDATE)
 .if exists(/usr/include/osreldate.h)
@@ -444,7 +450,7 @@ BUILD_ARCH!=	uname -p
 .endif
 .endif
 WORLDTMP=	${OBJTREE}${.CURDIR}/tmp
-BPATH=		${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
+BPATH=		${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin
 XPATH=		${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin
 STRICTTMPPATH=	${BPATH}:${XPATH}
 TMPPATH=	${STRICTTMPPATH}:${PATH}
@@ -760,10 +766,12 @@ _worldtmp: .PHONY
 	rm -rf ${LIBCOMPATTMP}
 .endif
 .else
+.if exists(${WORLDTMP})
 	@echo ">>> Deleting stale files in build tree..."
 	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
 	    delete-old delete-old-libs >/dev/null
-.if defined(LIBCOMPAT)
+.endif
+.if defined(LIBCOMPAT) && exists(${LIBCOMPATTMP})
 	${_+_}cd ${.CURDIR}; ${WMAKE} -DBATCH_DELETE_OLD_FILES \
 	    DESTDIR=${LIBCOMPATTMP} \
 	    delete-old delete-old-libs >/dev/null
@@ -1491,20 +1499,24 @@ packagekernel: .PHONY
 	    @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
+.if ${MK_DEBUG_FILES} != "no"
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --include '*/*/*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+.endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --exclude '*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
+.if ${MK_DEBUG_FILES} != "no"
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --include '*/*/*.debug' \
 	    @${DESTDIR}/${DISTDIR}/kernel.${_kernel}.meta | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
+.endif
 .endfor
 .endif
 .else
@@ -1513,17 +1525,21 @@ packagekernel: .PHONY
 	    tar cvf - --exclude '*.debug' . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.txz
 .endif
+.if ${MK_DEBUG_FILES} != "no"
 	cd ${DESTDIR}/${DISTDIR}/kernel; \
 	    tar cvf - --include '*/*/*.debug' $$(eval find .) | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel-dbg.txz
+.endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
 .for _kernel in ${BUILDKERNELS:[2..-1]}
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --exclude '*.debug' . | \
 	    ${XZ_CMD} > ${PACKAGEDIR}/kernel.${_kernel}.txz
+.if ${MK_DEBUG_FILES} != "no"
 	cd ${DESTDIR}/${DISTDIR}/kernel.${_kernel}; \
 	    tar cvf - --include '*/*/*.debug' $$(eval find .) | \
 	    ${XZ_CMD} > ${DESTDIR}/${DISTDIR}/kernel.${_kernel}-dbg.txz
+.endif
 .endfor
 .endif
 .endif
@@ -1616,7 +1632,11 @@ create-world-package-${pkgname}: .PHONY
 	@awk -F\" ' \
 		/^name/ { printf("===> Creating %s-", $$2); next } \
 		/^version/ { print $$2; next } \
-		' ${WSTAGEDIR}/${pkgname}.ucl ; \
+		' ${WSTAGEDIR}/${pkgname}.ucl
+	@if [ "${pkgname}" == "runtime" ]; then \
+		sed -i '' -e "s/%KERNCONF%/${INSTALLKERNEL:tl}/" ${WSTAGEDIR}/${pkgname}.ucl ; \
+		sed -i '' -e "s/%VCS_REVISION%/${VCS_REVISION}/" ${WSTAGEDIR}/${pkgname}.ucl ; \
+	fi
 	${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh -o ALLOW_BASE_SHLIBS=yes \
 		create -M ${WSTAGEDIR}/${pkgname}.ucl \
 		-p ${WSTAGEDIR}/${pkgname}.plist \
@@ -1627,7 +1647,10 @@ create-world-package-${pkgname}: .PHONY
 create-kernel-packages:	.PHONY
 _default_flavor=	-default
 .if exists(${KSTAGEDIR}/kernel.meta)
-.for flavor in "" -debug
+. if ${MK_DEBUG_FILES} != "no"
+_debug=-debug
+. endif
+. for flavor in "" ${_debug}
 create-kernel-packages: create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}
 create-kernel-packages-flavor${flavor:C,^""$,${_default_flavor},}: _pkgbootstrap .PHONY
 	@cd ${KSTAGEDIR}/${DISTDIR} ; \
@@ -1642,6 +1665,7 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
 		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
+		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -1653,12 +1677,15 @@ create-kernel-packages-flavor${flavor:C,^""$,${_defaul
 		-p ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.plist \
 		-r ${KSTAGEDIR}/${DISTDIR} \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
-.endfor
+. endfor
 .endif
 .if ${BUILDKERNELS:[#]} > 1 && ${NO_INSTALLEXTRAKERNELS} != "yes"
-.for _kernel in ${BUILDKERNELS:[2..-1]}
-.if exists(${KSTAGEDIR}/kernel.${_kernel}.meta)
-.for flavor in "" -debug
+. for _kernel in ${BUILDKERNELS:[2..-1]}
+.  if exists(${KSTAGEDIR}/kernel.${_kernel}.meta)
+.   if ${MK_DEBUG_FILES} != "no"
+_debug=-debug
+.   endif
+.   for flavor in "" ${_debug}
 create-kernel-packages: create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}
 create-kernel-packages-extra-flavor${flavor:C,^""$,${_default_flavor},}-${_kernel}: _pkgbootstrap .PHONY
 	@cd ${KSTAGEDIR}/kernel.${_kernel} ; \
@@ -1673,6 +1700,7 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/$${cap_arg}/g" \
 		-e "s/%PWD_MKDB_ENDIAN%/$${pwd_arg}/g" \
+		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -1684,10 +1712,10 @@ create-kernel-packages-extra-flavor${flavor:C,^""$,${_
 		-p ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.plist \
 		-r ${KSTAGEDIR}/kernel.${_kernel} \
 		-o ${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/${PKG_VERSION}
-.endfor
+.   endfor
+.  endif
+. endfor
 .endif
-.endfor
-.endif
 
 sign-packages:	_pkgbootstrap .PHONY
 	@[ -L "${REPODIR}/$$(${PKG_CMD} -o ABI_FILE=${WSTAGEDIR}/bin/sh config ABI)/latest" ] && \
@@ -2740,8 +2768,7 @@ CD2CFLAGS+=	-isystem ${XDDESTDIR}/usr/include -L${XDDE
 # combined with --sysroot.
 CD2CFLAGS+=	-B${XDDESTDIR}/usr/lib
 # Force using libc++ for external GCC.
-# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800
+.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800
 CD2CXXFLAGS+=	-isystem ${XDDESTDIR}/usr/include/c++/v1 -std=c++11 \
 		-nostdinc++
 .endif
@@ -2759,9 +2786,6 @@ CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/u
 CD2MAKE+=	BUILD_TOOLS_META=.NOMETA
 .endif
 XDDESTDIR=${DESTDIR}/${XDTP}
-.if !defined(OSREL)
-OSREL!= uname -r | sed -e 's/[-(].*//'
-.endif
 
 .ORDER: xdev-build xdev-install xdev-links
 xdev: xdev-build xdev-install .PHONY
@@ -2855,7 +2879,7 @@ xdev-links: .PHONY
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
-			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
+			    ../../../../usr/bin/${XDDIR}${_REVISION}-$$i; \
 		done
 .else
 xdev xdev-build xdev-install xdev-links: .PHONY

Modified: projects/numa2/Makefile.libcompat
==============================================================================
--- projects/numa2/Makefile.libcompat	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/Makefile.libcompat	Fri Aug 11 22:39:38 2017	(r322417)
@@ -99,8 +99,7 @@ LIBCOMPATCFLAGS+=	-B${LIBCOMPATTMP}/usr/lib${libcompat
 # sysroot path which --sysroot does not actually do for headers.
 LIBCOMPATCFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include
 # Force using libc++ for external GCC.
-# XXX: This should be checking MK_GNUCXX == no
-.if ${X_COMPILER_VERSION} >= 40800 && \
+.if ${X_COMPILER_TYPE} == gcc && ${X_COMPILER_VERSION} >= 40800 && \
     (${MK_CLANG_BOOTSTRAP} == "no" && ${MK_GCC_BOOTSTRAP} == "no")
 LIBCOMPATCXXFLAGS+=	-isystem ${LIBCOMPATTMP}/usr/include/c++/v1 -std=c++11 \
 			-nostdinc++

Modified: projects/numa2/ObsoleteFiles.inc
==============================================================================
--- projects/numa2/ObsoleteFiles.inc	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/ObsoleteFiles.inc	Fri Aug 11 22:39:38 2017	(r322417)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20170802: ksyms(4) ioctl interface was removed
+OLD_FILES+=usr/include/sys/ksyms.h
+
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0.
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h

Modified: projects/numa2/UPDATING
==============================================================================
--- projects/numa2/UPDATING	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/UPDATING	Fri Aug 11 22:39:38 2017	(r322417)
@@ -51,6 +51,19 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20170808:
+	Since the switch to GPT disk labels, fsck for UFS/FFS has been
+	unable to automatically find alternate superblocks. As of r322297,
+	the information needed to find alternate superblocks has been
+	moved to the end of the area reserved for the boot block.
+	Filesystems created with a newfs of this vintage or later
+	will create the recovery information. If you have a filesystem
+	created prior to this change and wish to have a recovery block
+	created for your filesystem, you can do so by running fsck in
+	forground mode (i.e., do not use the -p or -y options). As it
+	starts, fsck will ask ``SAVE DATA TO FIND ALTERNATE SUPERBLOCKS''
+	to which you should answer yes.
+
 20170728:
 	As of r321665, an NFSv4 server configuration that services
 	Kerberos mounts or clients that do not support the uid/gid in
@@ -64,8 +77,8 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	and upgrading, if you are not already using clang 3.5.0 or higher.
 
 20170701:
-	WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need them to be
-	built with the base system.
+	WITHOUT_RCMDS is now the default. Set WITH_RCMDS if you need the
+	r-commands (rlogin, rsh, etc.) to be built with the base system.
 
 20170625:
 	The FreeBSD/powerpc platform now uses a 64-bit type for time_t.  This is

Modified: projects/numa2/bin/cat/Makefile
==============================================================================
--- projects/numa2/bin/cat/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/cat/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	cat
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/cat/cat.c
==============================================================================
--- projects/numa2/bin/cat/cat.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/cat/cat.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -51,12 +51,12 @@ __FBSDID("$FreeBSD$");
 #ifndef NO_UDOM_SUPPORT
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <errno.h>
 #include <netdb.h>
 #endif
 
 #include <ctype.h>
 #include <err.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
 #include <stddef.h>

Modified: projects/numa2/bin/chmod/tests/chmod_test.sh
==============================================================================
--- projects/numa2/bin/chmod/tests/chmod_test.sh	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/chmod/tests/chmod_test.sh	Fri Aug 11 22:39:38 2017	(r322417)
@@ -25,6 +25,13 @@
 #
 # $FreeBSD$
 
+get_filesystem()
+{
+	local mountpoint=$1
+
+	df -T $mountpoint | tail -n 1 | cut -wf 2
+}
+
 atf_test_case RH_flag
 RH_flag_head()
 {
@@ -94,6 +101,11 @@ f_flag_body()
 {
 	atf_check truncate -s 0 foo bar
 	atf_check chmod 0750 foo bar
+	case "$(get_filesystem .)" in
+	zfs)
+		atf_expect_fail "ZFS doesn't support UF_IMMUTABLE; returns EPERM - bug 221189"
+		;;
+	esac
 	atf_check chflags uchg foo
 	atf_check -e not-empty -s not-exit:0 chmod 0700 foo bar
 	atf_check -o inline:'100750\n100700\n' stat -f '%p' foo bar
@@ -103,7 +115,7 @@ f_flag_body()
 
 f_flag_cleanup()
 {
-	atf_check chflags 0 foo
+	chflags 0 foo || :
 }
 
 atf_test_case h_flag
@@ -140,6 +152,11 @@ v_flag_body()
 	atf_check truncate -s 0 foo bar
 	atf_check chmod 0600 foo
 	atf_check chmod 0750 bar
+	case "$(get_filesystem .)" in
+	zfs)
+		atf_expect_fail "ZFS updates mode for foo unnecessarily - bug 221188"
+		;;
+	esac
 	atf_check -o 'inline:bar\n' chmod -v 0600 foo bar
 	atf_check chmod -v 0600 foo bar
 	for f in foo bar; do

Modified: projects/numa2/bin/date/Makefile
==============================================================================
--- projects/numa2/bin/date/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/date/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -7,8 +7,6 @@ PACKAGE=runtime
 PROG=	date
 SRCS=	date.c netdate.c vary.c
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/dd/Makefile
==============================================================================
--- projects/numa2/bin/dd/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/dd/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -38,8 +38,6 @@ test: ${PROG} gen
 
 	@rm -f gen 1M_zeroes* obs_zeroes
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/df/df.1
==============================================================================
--- projects/numa2/bin/df/df.1	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/df/df.1	Fri Aug 11 22:39:38 2017	(r322417)
@@ -29,7 +29,7 @@
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
 .\" $FreeBSD$
 .\"
-.Dd December 1, 2015
+.Dd August 8, 2017
 .Dt DF 1
 .Os
 .Sh NAME
@@ -97,7 +97,7 @@ output.
 Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
 Pebibyte (based on powers of 1024) in order to reduce the number of
 digits to four or fewer.
-.It Fl H
+.It Fl H , Fl Fl si
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,

Modified: projects/numa2/bin/df/df.c
==============================================================================
--- projects/numa2/bin/df/df.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/df/df.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <ufs/ufs/ufsmount.h>
 #endif
 #include <err.h>
+#include <getopt.h>
 #include <libutil.h>
 #include <locale.h>
 #ifdef MOUNT_CHAR_DEVS
@@ -107,6 +108,12 @@ static int	thousands;
 static struct	ufs_args mdev;
 #endif
 
+static const struct option long_options[] =
+{
+	{ "si", no_argument, NULL, 'H' },
+	{ NULL, no_argument, NULL, 0 },
+};
+
 int
 main(int argc, char *argv[])
 {
@@ -142,7 +149,8 @@ main(int argc, char *argv[])
 	if (argc < 0)
 		exit(1);
 
-	while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T,")) != -1)
+	while ((ch = getopt_long(argc, argv, "+abcgHhiklmnPt:T,", long_options,
+	    NULL)) != -1)
 		switch (ch) {
 		case 'a':
 			aflag = 1;

Modified: projects/numa2/bin/echo/Makefile
==============================================================================
--- projects/numa2/bin/echo/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/echo/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	echo
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= 	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/expr/Makefile
==============================================================================
--- projects/numa2/bin/expr/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/expr/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -12,8 +12,6 @@ CFLAGS+= -fwrapv
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/ln/Makefile
==============================================================================
--- projects/numa2/bin/ln/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/ln/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -10,8 +10,6 @@ MAN=	ln.1 symlink.7
 LINKS=	${BINDIR}/ln ${BINDIR}/link
 MLINKS=	ln.1 link.1
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= 	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/ls/Makefile
==============================================================================
--- projects/numa2/bin/ls/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/ls/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -14,8 +14,6 @@ CFLAGS+= -DCOLORLS
 LIBADD+=	termcapw
 .endif
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/mv/Makefile
==============================================================================
--- projects/numa2/bin/mv/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/mv/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	mv
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/pax/Makefile
==============================================================================
--- projects/numa2/bin/pax/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/pax/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -33,8 +33,6 @@ SRCS=	ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file
 	gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
 	tables.c tar.c tty_subs.c
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/pkill/Makefile
==============================================================================
--- projects/numa2/bin/pkill/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/pkill/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -19,8 +19,6 @@ MLINKS=	pkill.1 pgrep.1
 SYMLINKS=	../..${BINDIR}/pkill /usr/bin/pkill
 SYMLINKS+=	../..${BINDIR}/pgrep /usr/bin/pgrep
 
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/pkill/pkill.c
==============================================================================
--- projects/numa2/bin/pkill/pkill.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/pkill/pkill.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/user.h>
 
 #include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -656,10 +657,12 @@ killact(const struct kinfo_proc *kp)
 static int
 grepact(const struct kinfo_proc *kp)
 {
+	static bool first = true;
 
-	show_process(kp);
-	if (!quiet)
+	if (!quiet && !first)
 		printf("%s", delim);
+	show_process(kp);
+	first = false;
 	return (1);
 }
 

Modified: projects/numa2/bin/sh/Makefile
==============================================================================
--- projects/numa2/bin/sh/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/sh/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -64,8 +64,6 @@ syntax.c syntax.h: mksyntax
 token.h: mktokens
 	sh ${.CURDIR}/mktokens
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/sleep/Makefile
==============================================================================
--- projects/numa2/bin/sleep/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/sleep/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -6,8 +6,6 @@
 PACKAGE=runtime
 PROG=	sleep
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/bin/test/Makefile
==============================================================================
--- projects/numa2/bin/test/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/bin/test/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -8,8 +8,6 @@ PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
 MLINKS=	test.1 [.1
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=    tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>

Modified: projects/numa2/cddl/Makefile
==============================================================================
--- projects/numa2/cddl/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -5,9 +5,7 @@
 SUBDIR=	lib .WAIT \
 	sbin usr.bin usr.sbin
 
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 SUBDIR_PARALLEL=
 

Modified: projects/numa2/cddl/contrib/opensolaris/cmd/lockstat/sym.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -48,7 +48,6 @@
 #include <kstat.h>
 #else
 #include <sys/elf.h>
-#include <sys/ksyms.h>
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/linker.h>
@@ -175,10 +174,6 @@ symtab_init(void)
 	int		fd;
 	int		i;
 	int		strindex = -1;
-#ifndef illumos
-	void		*ksyms;
-	size_t		sz;
-#endif
 
 #ifndef illumos
 	if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) {
@@ -194,33 +189,9 @@ symtab_init(void)
 		return (-1);
 #endif
 
-#ifdef illumos
 	(void) elf_version(EV_CURRENT);
 
 	elf = elf_begin(fd, ELF_C_READ, NULL);
-#else
-	/* 
-	 * XXX - libelf needs to be fixed so it will work with
-	 * non 'ordinary' files like /dev/ksyms.  The following
-	 * is a work around for now.
-	 */ 
-	if (elf_version(EV_CURRENT) == EV_NONE) {
-		close(fd);
-		return (-1);
-	}
-	if (ioctl(fd, KIOCGSIZE, &sz) < 0) {
-		close(fd);
-		return (-1);
-	}
-	if (ioctl(fd, KIOCGADDR, &ksyms) < 0) {
-		close(fd);
-		return (-1);
-	}
-	if ((elf = elf_memory(ksyms, sz)) == NULL) {
-		close(fd);
-		return (-1);
-	}
-#endif 
 
 	for (cnt = 1; (scn = elf_nextscn(elf, scn)) != NULL; cnt++) {
 		Shdr *shdr = elf_getshdr(scn);

Modified: projects/numa2/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -1838,7 +1838,6 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z
 	uint64_t object = lr->lr_foid;
 	uint64_t offset = lr->lr_offset;
 	uint64_t size = lr->lr_length;
-	blkptr_t *bp = &lr->lr_blkptr;
 	uint64_t txg = lr->lr_common.lrc_txg;
 	uint64_t crtxg;
 	dmu_object_info_t doi;
@@ -1892,11 +1891,7 @@ ztest_get_data(void *arg, lr_write_t *lr, char *buf, z
 		    DMU_READ_NO_PREFETCH);
 
 		if (error == 0) {
-			blkptr_t *obp = dmu_buf_get_blkptr(db);
-			if (obp) {
-				ASSERT(BP_IS_HOLE(bp));
-				*bp = *obp;
-			}
+			blkptr_t *bp = &lr->lr_blkptr;
 
 			zgd->zgd_db = db;
 			zgd->zgd_bp = bp;

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -250,7 +250,7 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__L
 			    dofr[j].dofr_offset + 4;
 			rel->r_info = ELF32_R_INFO(count + dep->de_global,
 			    R_PPC_REL32);
-#elif defined(__riscv__)
+#elif defined(__riscv)
 /* XXX */
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #else
@@ -430,7 +430,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof,
 			    dofr[j].dofr_offset;
 			rel->r_info = ELF64_R_INFO(count + dep->de_global,
 			    R_PPC64_REL64);
-#elif defined(__riscv__)
+#elif defined(__riscv)
 /* XXX */
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
@@ -904,7 +904,7 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, 
 
 	return (0);
 }
-#elif defined(__riscv__)
+#elif defined(__riscv)
 /* XXX */
 static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -311,7 +311,7 @@ pfprint_fp(dtrace_hdl_t *dtp, FILE *fp, const char *fo
 		return (dt_printf(dtp, fp, format,
 		    *((double *)addr) / n));
 #if !defined(__arm__) && !defined(__powerpc__) && \
-    !defined(__mips__) && !defined(__riscv__)
+    !defined(__mips__) && !defined(__riscv)
 	case sizeof (long double):
 		return (dt_printf(dtp, fp, format,
 		    *((long double *)addr) / ldn));

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -74,6 +74,9 @@ zcmd_ioctl(int fd, int request, zfs_cmd_t *zc)
 
 	if (zfs_ioctl_version >= ZFS_IOCVER_DEADMAN) {
 		switch (zfs_ioctl_version) {
+		case ZFS_IOCVER_INLANES:
+			cflag = ZFS_CMD_COMPAT_INLANES;
+			break;
 		case ZFS_IOCVER_RESUME:
 			cflag = ZFS_CMD_COMPAT_RESUME;
 			break;

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -103,7 +103,6 @@ zfs_validate_name(libzfs_handle_t *hdl, const char *pa
 	namecheck_err_t why;
 	char what;
 
-	(void) zfs_prop_get_table();
 	if (entity_namecheck(path, &why, &what) != 0) {
 		if (hdl != NULL) {
 			switch (why) {
@@ -3958,14 +3957,19 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, bo
 	}
 
 	/*
-	 * We rely on zfs_iter_children() to verify that there are no
-	 * newer snapshots for the given dataset.  Therefore, we can
-	 * simply pass the name on to the ioctl() call.  There is still
-	 * an unlikely race condition where the user has taken a
-	 * snapshot since we verified that this was the most recent.
+	 * Pass both the filesystem and the wanted snapshot names,
+	 * we would get an error back if the snapshot is destroyed or
+	 * a new snapshot is created before this request is processed.
 	 */
-	err = lzc_rollback(zhp->zfs_name, NULL, 0);
-	if (err != 0) {
+	err = lzc_rollback_to(zhp->zfs_name, snap->zfs_name);
+	if (err == EXDEV) {
+		zfs_error_aux(zhp->zfs_hdl, dgettext(TEXT_DOMAIN,
+		    "'%s' is not the latest snapshot"), snap->zfs_name);
+		(void) zfs_error_fmt(zhp->zfs_hdl, EZFS_BUSY,
+		    dgettext(TEXT_DOMAIN, "cannot rollback '%s'"),
+		    zhp->zfs_name);
+		return (err);
+	} else if (err != 0) {
 		(void) zfs_standard_error_fmt(zhp->zfs_hdl, errno,
 		    dgettext(TEXT_DOMAIN, "cannot rollback '%s'"),
 		    zhp->zfs_name);

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -765,6 +765,9 @@ lzc_receive_with_header(const char *snapname, nvlist_t
  * Roll back this filesystem or volume to its most recent snapshot.
  * If snapnamebuf is not NULL, it will be filled in with the name
  * of the most recent snapshot.
+ * Note that the latest snapshot may change if a new one is concurrently
+ * created or the current one is destroyed.  lzc_rollback_to can be used
+ * to roll back to a specific latest snapshot.
  *
  * Return 0 on success or an errno on failure.
  */
@@ -784,6 +787,27 @@ lzc_rollback(const char *fsname, char *snapnamebuf, in
 	}
 	nvlist_free(result);
 
+	return (err);
+}
+
+/*
+ * Roll back this filesystem or volume to the specified snapshot,
+ * if possible.
+ *
+ * Return 0 on success or an errno on failure.
+ */
+int
+lzc_rollback_to(const char *fsname, const char *snapname)
+{
+	nvlist_t *args;
+	nvlist_t *result;
+	int err;
+
+	args = fnvlist_alloc();
+	fnvlist_add_string(args, "target", snapname);
+	err = lzc_ioctl(ZFS_IOC_ROLLBACK, fsname, args, &result);
+	nvlist_free(args);
+	nvlist_free(result);
 	return (err);
 }
 

Modified: projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
==============================================================================
--- projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -84,6 +84,7 @@ int lzc_receive_with_header(const char *, nvlist_t *, 
 boolean_t lzc_exists(const char *);
 
 int lzc_rollback(const char *, char *, int);
+int lzc_rollback_to(const char *, const char *);
 
 #ifdef	__cplusplus
 }

Modified: projects/numa2/cddl/lib/Makefile
==============================================================================
--- projects/numa2/cddl/lib/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/lib/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -12,11 +12,8 @@ SUBDIR=	${_drti} \
 	${_libzfs_core} \
 	${_libzfs} \
 	${_libzpool} \
-	${_tests}
 
-.if ${MK_TESTS} != "no"
-_tests=		tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
 _libzfs_core=	libzfs_core

Modified: projects/numa2/cddl/sbin/Makefile
==============================================================================
--- projects/numa2/cddl/sbin/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/sbin/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -2,11 +2,9 @@
 
 .include <src.opts.mk>
 
-SUBDIR=	${_tests} ${_zfs} ${_zpool}
+SUBDIR=	${_zfs} ${_zpool}
 
-.if ${MK_TESTS} != "no"
-_tests=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
 _zfs=	zfs

Modified: projects/numa2/cddl/usr.bin/Makefile
==============================================================================
--- projects/numa2/cddl/usr.bin/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/usr.bin/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -6,15 +6,12 @@ SUBDIR= \
 	ctfconvert \
 	ctfdump \
 	ctfmerge \
-	${_tests} \
 	${_zinject} \
 	${_zlook} \
 	${_zstreamdump} \
 	${_ztest}
 
-.if ${MK_TESTS} != "no"
-_tests=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
 _zinject= zinject

Modified: projects/numa2/cddl/usr.sbin/Makefile
==============================================================================
--- projects/numa2/cddl/usr.sbin/Makefile	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/cddl/usr.sbin/Makefile	Fri Aug 11 22:39:38 2017	(r322417)
@@ -5,14 +5,11 @@
 SUBDIR=	${_dtrace} \
 	${_lockstat} \
 	${_plockstat} \
-	${_tests} \
 	${_zdb} \
 	${_zfsd} \
 	${_zhack}
 
-.if ${MK_TESTS} != "no"
-_tests=	tests
-.endif
+SUBDIR.${MK_TESTS}+= tests
 
 .if ${MK_ZFS} != "no"
 .if ${MK_LIBTHR} != "no"

Modified: projects/numa2/contrib/compiler-rt/lib/builtins/int_lib.h
==============================================================================
--- projects/numa2/contrib/compiler-rt/lib/builtins/int_lib.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/compiler-rt/lib/builtins/int_lib.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -92,7 +92,7 @@
  * does not have dedicated bit counting instructions.
  */
 #if defined(__FreeBSD__) && (defined(__sparc64__) || \
-    defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__))
+    defined(__mips_n64) || defined(__mips_o64) || defined(__riscv))
 si_int __clzsi2(si_int);
 si_int __ctzsi2(si_int);
 #define	__builtin_clz __clzsi2

Modified: projects/numa2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
==============================================================================
--- projects/numa2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -83,7 +83,7 @@ namespace __sanitizer {
 #elif defined(__powerpc64__)
   const unsigned struct_kernel_stat_sz = 144;
   const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__riscv__)
+#elif defined(__riscv)
   /* RISCVTODO: check that these values are correct */
   const unsigned struct_kernel_stat_sz = 128;
   const unsigned struct_kernel_stat64_sz = 128;
@@ -126,7 +126,7 @@ namespace __sanitizer {
 
 #if SANITIZER_LINUX || SANITIZER_FREEBSD
 
-#if defined(__powerpc64__) || defined(__riscv__) || defined(__s390__)
+#if defined(__powerpc64__) || defined(__riscv) || defined(__s390__)
   const unsigned struct___old_kernel_stat_sz = 0;
 #elif !defined(__sparc__)
   const unsigned struct___old_kernel_stat_sz = 32;
@@ -554,7 +554,7 @@ namespace __sanitizer {
   typedef long __sanitizer___kernel_off_t;
 #endif
 
-#if defined(__powerpc__) || defined(__mips__) || defined(__riscv__)
+#if defined(__powerpc__) || defined(__mips__) || defined(__riscv)
   typedef unsigned int __sanitizer___kernel_old_uid_t;
   typedef unsigned int __sanitizer___kernel_old_gid_t;
 #else

Modified: projects/numa2/contrib/elftoolchain/libelf/_libelf_config.h
==============================================================================
--- projects/numa2/contrib/elftoolchain/libelf/_libelf_config.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/elftoolchain/libelf/_libelf_config.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -97,7 +97,7 @@
 #define	LIBELF_BYTEORDER	ELFDATA2MSB
 #define	LIBELF_CLASS		ELFCLASS32
 
-#elif	defined(__riscv64)
+#elif	defined(__riscv) && (__riscv_xlen == 64)
 
 #define	LIBELF_ARCH		EM_RISCV
 #define	LIBELF_BYTEORDER	ELFDATA2LSB

Modified: projects/numa2/contrib/ipfilter/tools/ippool.c
==============================================================================
--- projects/numa2/contrib/ipfilter/tools/ippool.c	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/ipfilter/tools/ippool.c	Fri Aug 11 22:39:38 2017	(r322417)
@@ -77,7 +77,7 @@ usage(prog)
 	fprintf(stderr, "Usage:\t%s\n", prog);
 	fprintf(stderr, "\t-a [-dnv] -m <name> [-o <role>] [-t type] [-T ttl] -i <ipaddr>[/netmask]\n");
 	fprintf(stderr, "\t-A [-dnv] [-m <name>] [-o <role>] [-S <seed>] [-t <type>]\n");
-	fprintf(stderr, "\t-f <file> [-dnuv]\n");
+	fprintf(stderr, "\t-f <file> [-dnuvR]\n");
 	fprintf(stderr, "\t-F [-dv] [-o <role>] [-t <type>]\n");
 	fprintf(stderr, "\t-l [-dv] [-m <name>] [-t <type>] [-o <role>] [-M <core>] [-N <namelist>]\n");
 	fprintf(stderr, "\t-r [-dnv] [-m <name>] [-o <role>] [-t type] -i <ipaddr>[/netmask]\n");

Modified: projects/numa2/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h
==============================================================================
--- projects/numa2/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -88,7 +88,7 @@ typedef int malloc_cpuid_t;
 #  ifdef __powerpc__
 #    define LG_QUANTUM		4
 #  endif
-#  ifdef __riscv__
+#  ifdef __riscv
 #    define LG_QUANTUM		4
 #  endif
 #  ifdef __s390__

Modified: projects/numa2/contrib/jemalloc/include/jemalloc/internal/spin.h
==============================================================================
--- projects/numa2/contrib/jemalloc/include/jemalloc/internal/spin.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/jemalloc/include/jemalloc/internal/spin.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -1,19 +1,13 @@
 #ifndef JEMALLOC_INTERNAL_SPIN_H
 #define JEMALLOC_INTERNAL_SPIN_H
 
-#ifdef JEMALLOC_SPIN_C_
-#  define SPIN_INLINE extern inline
-#else
-#  define SPIN_INLINE inline
-#endif
-
 #define SPIN_INITIALIZER {0U}
 
 typedef struct {
 	unsigned iteration;
 } spin_t;
 
-SPIN_INLINE void
+static inline void
 spin_adaptive(spin_t *spin) {
 	volatile uint32_t i;
 

Modified: projects/numa2/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
==============================================================================
--- projects/numa2/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -67,7 +67,7 @@
 #  define LG_VADDR		32
 #  define LG_SIZEOF_PTR		2
 #endif
-#ifdef __riscv__
+#ifdef __riscv
 #  define LG_VADDR		64
 #  define LG_SIZEOF_PTR		3
 #endif

Modified: projects/numa2/contrib/libc++/include/__bsd_locale_defaults.h
==============================================================================
--- projects/numa2/contrib/libc++/include/__bsd_locale_defaults.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/libc++/include/__bsd_locale_defaults.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -15,6 +15,10 @@
 #ifndef _LIBCPP_BSD_LOCALE_DEFAULTS_H
 #define _LIBCPP_BSD_LOCALE_DEFAULTS_H
 
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 #define __libcpp_mb_cur_max_l(loc)                          MB_CUR_MAX_L(loc)
 #define __libcpp_btowc_l(ch, loc)                           btowc_l(ch, loc)
 #define __libcpp_wctob_l(wch, loc)                          wctob_l(wch, loc)

Modified: projects/numa2/contrib/libc++/include/__bsd_locale_fallbacks.h
==============================================================================
--- projects/numa2/contrib/libc++/include/__bsd_locale_fallbacks.h	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/libc++/include/__bsd_locale_fallbacks.h	Fri Aug 11 22:39:38 2017	(r322417)
@@ -18,6 +18,10 @@
 #include <stdarg.h>
 #include <memory>
 
+#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#pragma GCC system_header
+#endif
+
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 inline _LIBCPP_ALWAYS_INLINE

Modified: projects/numa2/contrib/libc++/include/__locale
==============================================================================
--- projects/numa2/contrib/libc++/include/__locale	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/libc++/include/__locale	Fri Aug 11 22:39:38 2017	(r322417)
@@ -34,7 +34,7 @@
 # include <support/solaris/xlocale.h>
 #elif defined(_NEWLIB_VERSION)
 # include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__)      || defined(__FreeBSD__) \
+#elif (defined(__APPLE__)      || defined(__FreeBSD__) \
     || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
 # include <xlocale.h>
 #elif defined(__Fuchsia__)

Modified: projects/numa2/contrib/libc++/include/mutex
==============================================================================
--- projects/numa2/contrib/libc++/include/mutex	Fri Aug 11 20:44:17 2017	(r322416)
+++ projects/numa2/contrib/libc++/include/mutex	Fri Aug 11 22:39:38 2017	(r322417)
@@ -116,7 +116,7 @@ class scoped_lock // C++17 (public)
     using mutex_type = Mutex;  // If MutexTypes... consists of the single type Mutex
 
     explicit scoped_lock(MutexTypes&... m);
-    scoped_lock(MutexTypes&... m, adopt_lock_t);
+    scoped_lock(adopt_lock_t, MutexTypes&... m);
     ~scoped_lock();
     scoped_lock(scoped_lock const&) = delete;
     scoped_lock& operator=(scoped_lock const&) = delete;
@@ -500,7 +500,7 @@ class _LIBCPP_TEMPLATE_VIS scoped_lock<_Mutex> { (publ
     ~scoped_lock() _LIBCPP_THREAD_SAFETY_ANNOTATION(release_capability()) {__m_.unlock();}

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