svn commit: r330685 - in user/jeff/numa: . bin/chflags bin/ps bin/stty cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzpool/common cddl/lib/libdtrace cddl/usr.sbin cddl/...

Jeff Roberson jeff at FreeBSD.org
Fri Mar 9 05:55:57 UTC 2018


Author: jeff
Date: Fri Mar  9 05:55:53 2018
New Revision: 330685
URL: https://svnweb.freebsd.org/changeset/base/330685

Log:
  Merge from head

Added:
  user/jeff/numa/cddl/usr.sbin/dwatch/
     - copied from r330684, head/cddl/usr.sbin/dwatch/
  user/jeff/numa/contrib/bmake/mk/ldorder.mk
     - copied unchanged from r330684, head/contrib/bmake/mk/ldorder.mk
  user/jeff/numa/contrib/ntp/sntp/m4/ntp_af_unspec.m4
     - copied unchanged from r330684, head/contrib/ntp/sntp/m4/ntp_af_unspec.m4
  user/jeff/numa/contrib/ntp/sntp/tests/testconf.yml
     - copied unchanged from r330684, head/contrib/ntp/sntp/tests/testconf.yml
  user/jeff/numa/share/man/man4/fdt_pinctrl.4
     - copied unchanged from r330684, head/share/man/man4/fdt_pinctrl.4
  user/jeff/numa/share/man/man4/imcsmb.4
     - copied unchanged from r330684, head/share/man/man4/imcsmb.4
  user/jeff/numa/share/man/man4/mlx5io.4
     - copied unchanged from r330684, head/share/man/man4/mlx5io.4
  user/jeff/numa/share/man/man9/fdt_pinctrl.9
     - copied unchanged from r330684, head/share/man/man9/fdt_pinctrl.9
  user/jeff/numa/stand/defaults/
     - copied from r330684, head/stand/defaults/
  user/jeff/numa/stand/lua/core.lua.8
     - copied unchanged from r330684, head/stand/lua/core.lua.8
  user/jeff/numa/stand/lua/menu.lua.8
     - copied unchanged from r330684, head/stand/lua/menu.lua.8
  user/jeff/numa/stand/powerpc/ofw/elf_freebsd.c
     - copied unchanged from r330684, head/stand/powerpc/ofw/elf_freebsd.c
  user/jeff/numa/stand/powerpc/ofw/main.c
     - copied unchanged from r330684, head/stand/powerpc/ofw/main.c
  user/jeff/numa/stand/powerpc/ofw/ppc64_elf_freebsd.c
     - copied unchanged from r330684, head/stand/powerpc/ofw/ppc64_elf_freebsd.c
  user/jeff/numa/sys/arm/conf/GENERIC-MMCCAM
     - copied unchanged from r330684, head/sys/arm/conf/GENERIC-MMCCAM
  user/jeff/numa/sys/arm/freescale/imx/imx_spi.c
     - copied unchanged from r330684, head/sys/arm/freescale/imx/imx_spi.c
  user/jeff/numa/sys/arm64/rockchip/
     - copied from r330684, head/sys/arm64/rockchip/
  user/jeff/numa/sys/dev/imcsmb/
     - copied from r330684, head/sys/dev/imcsmb/
  user/jeff/numa/sys/dev/mlx5/cmd.h
     - copied unchanged from r330684, head/sys/dev/mlx5/cmd.h
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
     - copied unchanged from r330684, head/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
     - copied unchanged from r330684, head/sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
     - copied unchanged from r330684, head/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
     - copied unchanged from r330684, head/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
  user/jeff/numa/sys/dev/mlx5/mlx5io.h
     - copied unchanged from r330684, head/sys/dev/mlx5/mlx5io.h
  user/jeff/numa/sys/dev/mlx5/port.h
     - copied unchanged from r330684, head/sys/dev/mlx5/port.h
  user/jeff/numa/sys/dev/pci/pci_host_generic_acpi.c
     - copied unchanged from r330684, head/sys/dev/pci/pci_host_generic_acpi.c
  user/jeff/numa/sys/modules/i2c/controllers/imcsmb/
     - copied from r330684, head/sys/modules/i2c/controllers/imcsmb/
  user/jeff/numa/sys/modules/i2c/ds1672/
     - copied from r330684, head/sys/modules/i2c/ds1672/
  user/jeff/numa/sys/modules/i2c/rtc8583/
     - copied from r330684, head/sys/modules/i2c/rtc8583/
  user/jeff/numa/sys/modules/imx/imx_spi/
     - copied from r330684, head/sys/modules/imx/imx_spi/
  user/jeff/numa/sys/powerpc/powernv/opal_i2c.c
     - copied unchanged from r330684, head/sys/powerpc/powernv/opal_i2c.c
  user/jeff/numa/sys/powerpc/powernv/opal_i2cm.c
     - copied unchanged from r330684, head/sys/powerpc/powernv/opal_i2cm.c
  user/jeff/numa/sys/powerpc/powernv/powernv_centaur.c
     - copied unchanged from r330684, head/sys/powerpc/powernv/powernv_centaur.c
  user/jeff/numa/sys/powerpc/powernv/powernv_xscom.c
     - copied unchanged from r330684, head/sys/powerpc/powernv/powernv_xscom.c
  user/jeff/numa/tools/build/options/WITHOUT_KERNEL_RETPOLINE
     - copied unchanged from r330684, head/tools/build/options/WITHOUT_KERNEL_RETPOLINE
  user/jeff/numa/tools/build/options/WITHOUT_LOADER_OFW
     - copied unchanged from r330684, head/tools/build/options/WITHOUT_LOADER_OFW
  user/jeff/numa/tools/build/options/WITHOUT_LOADER_UBOOT
     - copied unchanged from r330684, head/tools/build/options/WITHOUT_LOADER_UBOOT
  user/jeff/numa/tools/build/options/WITHOUT_MLX5TOOL
     - copied unchanged from r330684, head/tools/build/options/WITHOUT_MLX5TOOL
  user/jeff/numa/tools/build/options/WITH_BSD_GREP_FASTMATCH
     - copied unchanged from r330684, head/tools/build/options/WITH_BSD_GREP_FASTMATCH
  user/jeff/numa/tools/build/options/WITH_KERNEL_RETPOLINE
     - copied unchanged from r330684, head/tools/build/options/WITH_KERNEL_RETPOLINE
  user/jeff/numa/tools/build/options/WITH_LOADER_OFW
     - copied unchanged from r330684, head/tools/build/options/WITH_LOADER_OFW
  user/jeff/numa/tools/build/options/WITH_LOADER_UBOOT
     - copied unchanged from r330684, head/tools/build/options/WITH_LOADER_UBOOT
  user/jeff/numa/tools/build/options/WITH_MLX5TOOL
     - copied unchanged from r330684, head/tools/build/options/WITH_MLX5TOOL
  user/jeff/numa/usr.bin/seq/tests/
     - copied from r330684, head/usr.bin/seq/tests/
  user/jeff/numa/usr.sbin/mlx5tool/
     - copied from r330684, head/usr.sbin/mlx5tool/
Deleted:
  user/jeff/numa/share/dtrace/watch_execve
  user/jeff/numa/share/dtrace/watch_kill
  user/jeff/numa/share/dtrace/watch_vop_remove
  user/jeff/numa/stand/Makefile.arm
  user/jeff/numa/stand/Makefile.arm64
  user/jeff/numa/stand/Makefile.i386
  user/jeff/numa/stand/Makefile.mips
  user/jeff/numa/stand/Makefile.powerpc
  user/jeff/numa/stand/Makefile.sparc64
  user/jeff/numa/stand/arm/loader/loader.conf
  user/jeff/numa/stand/forth/loader.conf
  user/jeff/numa/stand/forth/loader.conf.5
  user/jeff/numa/stand/mips/uboot/loader.conf
  user/jeff/numa/stand/ofw/common/
  user/jeff/numa/stand/ofw/libofw/elf_freebsd.c
  user/jeff/numa/stand/ofw/libofw/ppc64_elf_freebsd.c
  user/jeff/numa/sys/modules/i2c/ofw_iicbus/
Modified:
  user/jeff/numa/MAINTAINERS   (contents, props changed)
  user/jeff/numa/Makefile
  user/jeff/numa/Makefile.inc1
  user/jeff/numa/ObsoleteFiles.inc
  user/jeff/numa/README.md
  user/jeff/numa/bin/chflags/chflags.1
  user/jeff/numa/bin/chflags/chflags.c
  user/jeff/numa/bin/ps/ps.c
  user/jeff/numa/bin/stty/stty.1
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  user/jeff/numa/cddl/lib/libdtrace/io.d
  user/jeff/numa/cddl/lib/libdtrace/signal.d
  user/jeff/numa/cddl/usr.sbin/Makefile
  user/jeff/numa/contrib/bmake/ChangeLog
  user/jeff/numa/contrib/bmake/Makefile.config.in
  user/jeff/numa/contrib/bmake/VERSION
  user/jeff/numa/contrib/bmake/aclocal.m4
  user/jeff/numa/contrib/bmake/bmake.cat1
  user/jeff/numa/contrib/bmake/configure
  user/jeff/numa/contrib/bmake/configure.in
  user/jeff/numa/contrib/bmake/job.c
  user/jeff/numa/contrib/bmake/make.h
  user/jeff/numa/contrib/bmake/meta.c
  user/jeff/numa/contrib/bmake/mk/ChangeLog
  user/jeff/numa/contrib/bmake/mk/FILES
  user/jeff/numa/contrib/bmake/mk/auto.obj.mk
  user/jeff/numa/contrib/bmake/mk/dpadd.mk
  user/jeff/numa/contrib/bmake/mk/final.mk
  user/jeff/numa/contrib/bmake/mk/gendirdeps.mk
  user/jeff/numa/contrib/bmake/mk/install-mk
  user/jeff/numa/contrib/bmake/mk/lib.mk
  user/jeff/numa/contrib/bmake/mk/own.mk
  user/jeff/numa/contrib/bmake/mk/prog.mk
  user/jeff/numa/contrib/bmake/mk/sys.mk
  user/jeff/numa/contrib/bmake/mk/sys.vars.mk
  user/jeff/numa/contrib/bmake/os.sh
  user/jeff/numa/contrib/bmake/parse.c
  user/jeff/numa/contrib/bmake/stresep.c
  user/jeff/numa/contrib/bmake/unit-tests/varcmd.exp
  user/jeff/numa/contrib/bmake/unit-tests/varcmd.mk
  user/jeff/numa/contrib/bmake/var.c
  user/jeff/numa/contrib/llvm/include/llvm/Bitcode/LLVMBitCodes.h
  user/jeff/numa/contrib/llvm/include/llvm/MC/MCAsmMacro.h
  user/jeff/numa/contrib/llvm/include/llvm/Transforms/Utils/LoopUtils.h
  user/jeff/numa/contrib/llvm/lib/Analysis/ScalarEvolution.cpp
  user/jeff/numa/contrib/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
  user/jeff/numa/contrib/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AArch64/AArch64InstructionSelector.cpp
  user/jeff/numa/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
  user/jeff/numa/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86.td
  user/jeff/numa/contrib/llvm/lib/Target/X86/X86ISelLowering.cpp
  user/jeff/numa/contrib/llvm/lib/Transforms/InstCombine/InstCombineSelect.cpp
  user/jeff/numa/contrib/llvm/lib/Transforms/Scalar/LICM.cpp
  user/jeff/numa/contrib/llvm/lib/Transforms/Utils/LoopUtils.cpp
  user/jeff/numa/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  user/jeff/numa/contrib/llvm/tools/clang/include/clang/Basic/AttrDocs.td
  user/jeff/numa/contrib/llvm/tools/clang/lib/Basic/Targets/X86.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  user/jeff/numa/contrib/llvm/tools/clang/lib/Sema/SemaExpr.cpp
  user/jeff/numa/contrib/llvm/tools/lld/ELF/Driver.cpp
  user/jeff/numa/contrib/llvm/tools/lld/ELF/Options.td
  user/jeff/numa/contrib/netbsd-tests/kernel/t_sysv.c
  user/jeff/numa/contrib/ntp/ChangeLog
  user/jeff/numa/contrib/ntp/Makefile.am
  user/jeff/numa/contrib/ntp/Makefile.in
  user/jeff/numa/contrib/ntp/NEWS
  user/jeff/numa/contrib/ntp/aclocal.m4
  user/jeff/numa/contrib/ntp/adjtimed/Makefile.in
  user/jeff/numa/contrib/ntp/clockstuff/Makefile.in
  user/jeff/numa/contrib/ntp/configure
  user/jeff/numa/contrib/ntp/configure.ac
  user/jeff/numa/contrib/ntp/html/access.html
  user/jeff/numa/contrib/ntp/html/accopt.html
  user/jeff/numa/contrib/ntp/html/authentic.html
  user/jeff/numa/contrib/ntp/html/drivers/driver18.html
  user/jeff/numa/contrib/ntp/html/drivers/driver40-ja.html
  user/jeff/numa/contrib/ntp/html/drivers/driver40.html
  user/jeff/numa/contrib/ntp/html/keygen.html
  user/jeff/numa/contrib/ntp/html/miscopt.html
  user/jeff/numa/contrib/ntp/html/monopt.html
  user/jeff/numa/contrib/ntp/html/ntpq.html
  user/jeff/numa/contrib/ntp/include/Makefile.in
  user/jeff/numa/contrib/ntp/include/isc/Makefile.in
  user/jeff/numa/contrib/ntp/include/ntp.h
  user/jeff/numa/contrib/ntp/include/ntp_calendar.h
  user/jeff/numa/contrib/ntp/include/ntp_config.h
  user/jeff/numa/contrib/ntp/include/ntp_fp.h
  user/jeff/numa/contrib/ntp/include/ntp_keyacc.h
  user/jeff/numa/contrib/ntp/include/ntp_request.h
  user/jeff/numa/contrib/ntp/include/ntp_stdlib.h
  user/jeff/numa/contrib/ntp/include/ntpd.h
  user/jeff/numa/contrib/ntp/include/recvbuff.h
  user/jeff/numa/contrib/ntp/include/ssl_applink.c
  user/jeff/numa/contrib/ntp/kernel/Makefile.in
  user/jeff/numa/contrib/ntp/kernel/sys/Makefile.in
  user/jeff/numa/contrib/ntp/libntp/Makefile.in
  user/jeff/numa/contrib/ntp/libntp/a_md5encrypt.c
  user/jeff/numa/contrib/ntp/libntp/adjtime.c
  user/jeff/numa/contrib/ntp/libntp/authkeys.c
  user/jeff/numa/contrib/ntp/libntp/authreadkeys.c
  user/jeff/numa/contrib/ntp/libntp/libssl_compat.c
  user/jeff/numa/contrib/ntp/libntp/ntp_calendar.c
  user/jeff/numa/contrib/ntp/libntp/ssl_init.c
  user/jeff/numa/contrib/ntp/libntp/statestr.c
  user/jeff/numa/contrib/ntp/libntp/systime.c
  user/jeff/numa/contrib/ntp/libntp/work_thread.c
  user/jeff/numa/contrib/ntp/libparse/Makefile.in
  user/jeff/numa/contrib/ntp/ntpd/Makefile.in
  user/jeff/numa/contrib/ntp/ntpd/complete.conf.in
  user/jeff/numa/contrib/ntp/ntpd/invoke-ntp.conf.texi
  user/jeff/numa/contrib/ntp/ntpd/invoke-ntp.keys.texi
  user/jeff/numa/contrib/ntp/ntpd/invoke-ntpd.texi
  user/jeff/numa/contrib/ntp/ntpd/keyword-gen-utd
  user/jeff/numa/contrib/ntp/ntpd/keyword-gen.c
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.5man
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.5mdoc
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.def
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.html
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.man.in
  user/jeff/numa/contrib/ntp/ntpd/ntp.conf.mdoc.in
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.5man
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.5mdoc
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.def
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.html
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.man.in
  user/jeff/numa/contrib/ntp/ntpd/ntp.keys.mdoc.in
  user/jeff/numa/contrib/ntp/ntpd/ntp_config.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_control.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_crypto.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_io.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_keyword.h
  user/jeff/numa/contrib/ntp/ntpd/ntp_leapsec.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_parser.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_parser.h
  user/jeff/numa/contrib/ntp/ntpd/ntp_peer.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_proto.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_refclock.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_request.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_restrict.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_scanner.c
  user/jeff/numa/contrib/ntp/ntpd/ntp_util.c
  user/jeff/numa/contrib/ntp/ntpd/ntpd-opts.c
  user/jeff/numa/contrib/ntp/ntpd/ntpd-opts.h
  user/jeff/numa/contrib/ntp/ntpd/ntpd.1ntpdman
  user/jeff/numa/contrib/ntp/ntpd/ntpd.1ntpdmdoc
  user/jeff/numa/contrib/ntp/ntpd/ntpd.c
  user/jeff/numa/contrib/ntp/ntpd/ntpd.html
  user/jeff/numa/contrib/ntp/ntpd/ntpd.man.in
  user/jeff/numa/contrib/ntp/ntpd/ntpd.mdoc.in
  user/jeff/numa/contrib/ntp/ntpd/ntpsim.c
  user/jeff/numa/contrib/ntp/ntpd/refclock_gpsdjson.c
  user/jeff/numa/contrib/ntp/ntpd/refclock_jjy.c
  user/jeff/numa/contrib/ntp/ntpd/refclock_palisade.c
  user/jeff/numa/contrib/ntp/ntpd/refclock_parse.c
  user/jeff/numa/contrib/ntp/ntpdate/Makefile.in
  user/jeff/numa/contrib/ntp/ntpdc/Makefile.in
  user/jeff/numa/contrib/ntp/ntpdc/invoke-ntpdc.texi
  user/jeff/numa/contrib/ntp/ntpdc/layout.std
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc-opts.c
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc-opts.h
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.1ntpdcman
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.1ntpdcmdoc
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.c
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.html
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.man.in
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc.mdoc.in
  user/jeff/numa/contrib/ntp/ntpdc/ntpdc_ops.c
  user/jeff/numa/contrib/ntp/ntpq/Makefile.am
  user/jeff/numa/contrib/ntp/ntpq/Makefile.in
  user/jeff/numa/contrib/ntp/ntpq/invoke-ntpq.texi
  user/jeff/numa/contrib/ntp/ntpq/ntpq-opts.c
  user/jeff/numa/contrib/ntp/ntpq/ntpq-opts.def
  user/jeff/numa/contrib/ntp/ntpq/ntpq-opts.h
  user/jeff/numa/contrib/ntp/ntpq/ntpq-subs.c
  user/jeff/numa/contrib/ntp/ntpq/ntpq.1ntpqman
  user/jeff/numa/contrib/ntp/ntpq/ntpq.1ntpqmdoc
  user/jeff/numa/contrib/ntp/ntpq/ntpq.c
  user/jeff/numa/contrib/ntp/ntpq/ntpq.html
  user/jeff/numa/contrib/ntp/ntpq/ntpq.man.in
  user/jeff/numa/contrib/ntp/ntpq/ntpq.mdoc.in
  user/jeff/numa/contrib/ntp/ntpq/ntpq.texi
  user/jeff/numa/contrib/ntp/ntpsnmpd/Makefile.in
  user/jeff/numa/contrib/ntp/ntpsnmpd/invoke-ntpsnmpd.texi
  user/jeff/numa/contrib/ntp/ntpsnmpd/netsnmp_daemonize.c
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.c
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd-opts.h
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd.html
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd.man.in
  user/jeff/numa/contrib/ntp/ntpsnmpd/ntpsnmpd.mdoc.in
  user/jeff/numa/contrib/ntp/packageinfo.sh
  user/jeff/numa/contrib/ntp/parseutil/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/build/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/build/UpdatePoint
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjman
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/calc_tickadj.1calc_tickadjmdoc
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/calc_tickadj.html
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/calc_tickadj.man.in
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/calc_tickadj.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/calc_tickadj/invoke-calc_tickadj.texi
  user/jeff/numa/contrib/ntp/scripts/invoke-plot_summary.texi
  user/jeff/numa/contrib/ntp/scripts/invoke-summary.texi
  user/jeff/numa/contrib/ntp/scripts/lib/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/invoke-ntp-wait.texi
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait-opts
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitman
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait.1ntp-waitmdoc
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait.html
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait.man.in
  user/jeff/numa/contrib/ntp/scripts/ntp-wait/ntp-wait.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/invoke-ntpsweep.texi
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep-opts
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepman
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep.1ntpsweepmdoc
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep.html
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep.man.in
  user/jeff/numa/contrib/ntp/scripts/ntpsweep/ntpsweep.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/ntptrace/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/ntptrace/invoke-ntptrace.texi
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace-opts
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace.1ntptraceman
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace.1ntptracemdoc
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace.html
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace.man.in
  user/jeff/numa/contrib/ntp/scripts/ntptrace/ntptrace.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/plot_summary-opts
  user/jeff/numa/contrib/ntp/scripts/plot_summary.1plot_summaryman
  user/jeff/numa/contrib/ntp/scripts/plot_summary.1plot_summarymdoc
  user/jeff/numa/contrib/ntp/scripts/plot_summary.html
  user/jeff/numa/contrib/ntp/scripts/plot_summary.man.in
  user/jeff/numa/contrib/ntp/scripts/plot_summary.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/summary-opts
  user/jeff/numa/contrib/ntp/scripts/summary.1summaryman
  user/jeff/numa/contrib/ntp/scripts/summary.1summarymdoc
  user/jeff/numa/contrib/ntp/scripts/summary.html
  user/jeff/numa/contrib/ntp/scripts/summary.man.in
  user/jeff/numa/contrib/ntp/scripts/summary.mdoc.in
  user/jeff/numa/contrib/ntp/scripts/update-leap/Makefile.in
  user/jeff/numa/contrib/ntp/scripts/update-leap/invoke-update-leap.texi
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap-opts
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.1update-leapman
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.1update-leapmdoc
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.html
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.in
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.man.in
  user/jeff/numa/contrib/ntp/scripts/update-leap/update-leap.mdoc.in
  user/jeff/numa/contrib/ntp/sntp/Makefile.in
  user/jeff/numa/contrib/ntp/sntp/check-libntp.mf
  user/jeff/numa/contrib/ntp/sntp/configure
  user/jeff/numa/contrib/ntp/sntp/crypto.c
  user/jeff/numa/contrib/ntp/sntp/crypto.h
  user/jeff/numa/contrib/ntp/sntp/harden/linux
  user/jeff/numa/contrib/ntp/sntp/include/version.def
  user/jeff/numa/contrib/ntp/sntp/include/version.texi
  user/jeff/numa/contrib/ntp/sntp/invoke-sntp.texi
  user/jeff/numa/contrib/ntp/sntp/m4/ntp_harden.m4
  user/jeff/numa/contrib/ntp/sntp/m4/ntp_libevent.m4
  user/jeff/numa/contrib/ntp/sntp/m4/ntp_openssl.m4
  user/jeff/numa/contrib/ntp/sntp/m4/version.m4
  user/jeff/numa/contrib/ntp/sntp/main.c
  user/jeff/numa/contrib/ntp/sntp/networking.c
  user/jeff/numa/contrib/ntp/sntp/sntp-opts.c
  user/jeff/numa/contrib/ntp/sntp/sntp-opts.def
  user/jeff/numa/contrib/ntp/sntp/sntp-opts.h
  user/jeff/numa/contrib/ntp/sntp/sntp.1sntpman
  user/jeff/numa/contrib/ntp/sntp/sntp.1sntpmdoc
  user/jeff/numa/contrib/ntp/sntp/sntp.html
  user/jeff/numa/contrib/ntp/sntp/sntp.man.in
  user/jeff/numa/contrib/ntp/sntp/sntp.mdoc.in
  user/jeff/numa/contrib/ntp/sntp/tests/Makefile.am
  user/jeff/numa/contrib/ntp/sntp/tests/Makefile.in
  user/jeff/numa/contrib/ntp/sntp/tests/crypto.c
  user/jeff/numa/contrib/ntp/sntp/tests/keyFile.c
  user/jeff/numa/contrib/ntp/sntp/tests/packetHandling.c
  user/jeff/numa/contrib/ntp/sntp/tests/packetProcessing.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-crypto.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-keyFile.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-kodDatabase.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-kodFile.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-networking.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-packetHandling.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-packetProcessing.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-t-log.c
  user/jeff/numa/contrib/ntp/sntp/tests/run-utilities.c
  user/jeff/numa/contrib/ntp/sntp/unity/auto/generate_test_runner.rb
  user/jeff/numa/contrib/ntp/sntp/utilities.c
  user/jeff/numa/contrib/ntp/sntp/version.c
  user/jeff/numa/contrib/ntp/util/Makefile.in
  user/jeff/numa/contrib/ntp/util/invoke-ntp-keygen.texi
  user/jeff/numa/contrib/ntp/util/ntp-keygen-opts.c
  user/jeff/numa/contrib/ntp/util/ntp-keygen-opts.def
  user/jeff/numa/contrib/ntp/util/ntp-keygen-opts.h
  user/jeff/numa/contrib/ntp/util/ntp-keygen.1ntp-keygenman
  user/jeff/numa/contrib/ntp/util/ntp-keygen.1ntp-keygenmdoc
  user/jeff/numa/contrib/ntp/util/ntp-keygen.html
  user/jeff/numa/contrib/ntp/util/ntp-keygen.man.in
  user/jeff/numa/contrib/ntp/util/ntp-keygen.mdoc.in
  user/jeff/numa/contrib/sendmail/include/sm/os/sm_os_freebsd.h
  user/jeff/numa/etc/devd.conf
  user/jeff/numa/etc/mtree/BSD.include.dist
  user/jeff/numa/etc/mtree/BSD.tests.dist
  user/jeff/numa/etc/mtree/BSD.usr.dist
  user/jeff/numa/etc/rc.d/jail
  user/jeff/numa/etc/rc.d/pf
  user/jeff/numa/gnu/usr.bin/binutils/ld/Makefile
  user/jeff/numa/include/Makefile
  user/jeff/numa/include/ttyent.h
  user/jeff/numa/lib/clang/freebsd_cc_version.h
  user/jeff/numa/lib/clang/include/clang/Basic/Version.inc
  user/jeff/numa/lib/clang/include/lld/Common/Version.inc
  user/jeff/numa/lib/clang/include/llvm/Support/VCSRevision.h
  user/jeff/numa/lib/libc/arm/Symbol.map
  user/jeff/numa/lib/libc/gen/arc4random.c
  user/jeff/numa/lib/libc/gen/getttyent.3
  user/jeff/numa/lib/libc/gen/getttyent.c
  user/jeff/numa/lib/libc/gen/posix_spawn.3
  user/jeff/numa/lib/libc/gen/semctl.c
  user/jeff/numa/lib/libc/mips/Symbol.map
  user/jeff/numa/lib/libc/riscv/Symbol.map
  user/jeff/numa/lib/libc/rpc/des_crypt.3
  user/jeff/numa/lib/libc/softfloat/Symbol.map
  user/jeff/numa/lib/libc/sys/msgctl.2
  user/jeff/numa/lib/libc/sys/msgget.2
  user/jeff/numa/lib/libc/sys/semctl.2
  user/jeff/numa/lib/libc/sys/semget.2
  user/jeff/numa/lib/libc/sys/shmget.2
  user/jeff/numa/lib/libcasper/libcasper/libcasper.3
  user/jeff/numa/lib/libcasper/services/cap_dns/cap_dns.3
  user/jeff/numa/lib/libcasper/services/cap_grp/cap_grp.3
  user/jeff/numa/lib/libcasper/services/cap_random/cap_random.3
  user/jeff/numa/lib/libcasper/services/cap_syslog/cap_syslog.3
  user/jeff/numa/lib/libefivar/efi-osdep.h
  user/jeff/numa/lib/libefivar/efivar-dp-format.c
  user/jeff/numa/lib/libefivar/efivar-dp-parse.c
  user/jeff/numa/lib/libefivar/efivar-dp-xlate.c
  user/jeff/numa/lib/libefivar/efivar-dp.h
  user/jeff/numa/lib/libefivar/efivar.c
  user/jeff/numa/lib/libefivar/efivar.h
  user/jeff/numa/lib/libefivar/uefi-dplib.h
  user/jeff/numa/lib/libefivar/uefi-dputil.c
  user/jeff/numa/lib/libufs/sblock.c
  user/jeff/numa/lib/libutil/flopen.3
  user/jeff/numa/lib/libvmmapi/vmmapi.c
  user/jeff/numa/lib/libvmmapi/vmmapi.h
  user/jeff/numa/libexec/getty/getty.8
  user/jeff/numa/libexec/getty/gettytab.5
  user/jeff/numa/libexec/getty/main.c
  user/jeff/numa/libexec/getty/ttys.5
  user/jeff/numa/libexec/rpc.sprayd/Makefile
  user/jeff/numa/libexec/rpc.sprayd/sprayd.c
  user/jeff/numa/libexec/rtld-elf/aarch64/rtld_start.S
  user/jeff/numa/release/Makefile.vm
  user/jeff/numa/sbin/dhclient/dhclient.c
  user/jeff/numa/sbin/geom/class/part/gpart.8
  user/jeff/numa/sbin/init/init.c
  user/jeff/numa/sbin/ipfw/tables.c
  user/jeff/numa/sbin/route/route.c
  user/jeff/numa/share/dtrace/Makefile
  user/jeff/numa/share/man/man4/Makefile
  user/jeff/numa/share/man/man4/dtrace_lockstat.4
  user/jeff/numa/share/man/man4/isp.4
  user/jeff/numa/share/man/man4/psm.4
  user/jeff/numa/share/man/man5/periodic.conf.5
  user/jeff/numa/share/man/man5/src.conf.5
  user/jeff/numa/share/man/man8/diskless.8
  user/jeff/numa/share/man/man9/Makefile
  user/jeff/numa/share/man/man9/fpu_kern.9
  user/jeff/numa/share/man/man9/g_bio.9
  user/jeff/numa/share/man/man9/sleep.9
  user/jeff/numa/share/man/man9/style.lua.9
  user/jeff/numa/share/man/man9/sysctl.9
  user/jeff/numa/share/misc/committers-src.dot
  user/jeff/numa/share/mk/atf.test.mk
  user/jeff/numa/share/mk/src.opts.mk
  user/jeff/numa/share/mk/src.sys.env.mk
  user/jeff/numa/share/mk/src.sys.obj.mk
  user/jeff/numa/share/mk/sys.mk
  user/jeff/numa/stand/Makefile
  user/jeff/numa/stand/Makefile.amd64
  user/jeff/numa/stand/arm/Makefile
  user/jeff/numa/stand/common/metadata.c
  user/jeff/numa/stand/defs.mk
  user/jeff/numa/stand/efi/Makefile
  user/jeff/numa/stand/ficl/Makefile
  user/jeff/numa/stand/forth/Makefile
  user/jeff/numa/stand/i386/Makefile
  user/jeff/numa/stand/liblua/lstd.c
  user/jeff/numa/stand/liblua/lstd.h
  user/jeff/numa/stand/liblua/lutils.c
  user/jeff/numa/stand/libsa/cd9660.c
  user/jeff/numa/stand/libsa/net.c
  user/jeff/numa/stand/libsa/nullfs.c
  user/jeff/numa/stand/libsa/stand.h
  user/jeff/numa/stand/libsa/tftp.c
  user/jeff/numa/stand/libsa/ufs.c
  user/jeff/numa/stand/lua/Makefile
  user/jeff/numa/stand/lua/cli.lua
  user/jeff/numa/stand/lua/color.lua
  user/jeff/numa/stand/lua/config.lua
  user/jeff/numa/stand/lua/core.lua
  user/jeff/numa/stand/lua/drawer.lua
  user/jeff/numa/stand/lua/loader.lua
  user/jeff/numa/stand/lua/menu.lua
  user/jeff/numa/stand/lua/password.lua
  user/jeff/numa/stand/lua/screen.lua
  user/jeff/numa/stand/mips/Makefile
  user/jeff/numa/stand/ofw/libofw/Makefile
  user/jeff/numa/stand/ofw/libofw/libofw.h
  user/jeff/numa/stand/powerpc/Makefile
  user/jeff/numa/stand/powerpc/ofw/Makefile
  user/jeff/numa/stand/powerpc/ofw/conf.c
  user/jeff/numa/stand/sparc64/Makefile
  user/jeff/numa/stand/uboot/Makefile
  user/jeff/numa/sys/amd64/acpica/acpi_machdep.c
  user/jeff/numa/sys/amd64/amd64/db_interface.c
  user/jeff/numa/sys/amd64/amd64/db_trace.c
  user/jeff/numa/sys/amd64/amd64/gdb_machdep.c
  user/jeff/numa/sys/amd64/amd64/initcpu.c
  user/jeff/numa/sys/amd64/amd64/mpboot.S
  user/jeff/numa/sys/amd64/amd64/pmap.c
  user/jeff/numa/sys/amd64/conf/GENERIC
  user/jeff/numa/sys/amd64/conf/NOTES
  user/jeff/numa/sys/amd64/include/cpu.h
  user/jeff/numa/sys/amd64/include/gdb_machdep.h
  user/jeff/numa/sys/amd64/include/vmm.h
  user/jeff/numa/sys/amd64/include/vmm_dev.h
  user/jeff/numa/sys/amd64/include/vmm_instruction_emul.h
  user/jeff/numa/sys/amd64/linux/linux.h
  user/jeff/numa/sys/amd64/linux/linux_dummy.c
  user/jeff/numa/sys/amd64/vmm/amd/amdvi_priv.h
  user/jeff/numa/sys/amd64/vmm/amd/ivrs_drv.c
  user/jeff/numa/sys/amd64/vmm/intel/vmx.c
  user/jeff/numa/sys/amd64/vmm/vmm_dev.c
  user/jeff/numa/sys/amd64/vmm/vmm_instruction_emul.c
  user/jeff/numa/sys/arm/allwinner/aw_mmc.c
  user/jeff/numa/sys/arm/allwinner/aw_syscon.c
  user/jeff/numa/sys/arm/allwinner/aw_usbphy.c
  user/jeff/numa/sys/arm/allwinner/axp81x.c
  user/jeff/numa/sys/arm/allwinner/if_awg.c
  user/jeff/numa/sys/arm/arm/gic.c
  user/jeff/numa/sys/arm/arm/identcpu-v6.c
  user/jeff/numa/sys/arm/arm/machdep.c
  user/jeff/numa/sys/arm/arm/machdep_boot.c
  user/jeff/numa/sys/arm/arm/pmap-v4.c
  user/jeff/numa/sys/arm/arm/pmap-v6.c
  user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_intr.c
  user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/jeff/numa/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
  user/jeff/numa/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c
  user/jeff/numa/sys/arm/conf/DOCKSTAR
  user/jeff/numa/sys/arm/conf/DREAMPLUG-1001
  user/jeff/numa/sys/arm/conf/RK3188
  user/jeff/numa/sys/arm/freescale/imx/files.imx5
  user/jeff/numa/sys/arm/freescale/imx/files.imx6
  user/jeff/numa/sys/arm/freescale/imx/imx51_ccm.c
  user/jeff/numa/sys/arm/freescale/imx/imx6_ccm.c
  user/jeff/numa/sys/arm/freescale/imx/imx6_ccmreg.h
  user/jeff/numa/sys/arm/freescale/imx/imx6_usbphy.c
  user/jeff/numa/sys/arm/freescale/imx/imx_ccmvar.h
  user/jeff/numa/sys/arm/freescale/imx/imx_gpio.c
  user/jeff/numa/sys/arm/include/gdb_machdep.h
  user/jeff/numa/sys/arm/nvidia/tegra_sdhci.c
  user/jeff/numa/sys/arm64/arm64/exception.S
  user/jeff/numa/sys/arm64/arm64/gic_v3_acpi.c
  user/jeff/numa/sys/arm64/arm64/gicv3_its.c
  user/jeff/numa/sys/arm64/arm64/mp_machdep.c
  user/jeff/numa/sys/arm64/arm64/nexus.c
  user/jeff/numa/sys/arm64/arm64/pmap.c
  user/jeff/numa/sys/arm64/conf/GENERIC
  user/jeff/numa/sys/arm64/include/intr.h
  user/jeff/numa/sys/arm64/include/param.h
  user/jeff/numa/sys/cddl/compat/opensolaris/sys/assfail.h
  user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h
  user/jeff/numa/sys/cddl/dev/fbt/x86/fbt_isa.c
  user/jeff/numa/sys/compat/cloudabi/cloudabi_fd.c
  user/jeff/numa/sys/compat/cloudabi/cloudabi_file.c
  user/jeff/numa/sys/compat/freebsd32/freebsd32_ipc.h
  user/jeff/numa/sys/compat/freebsd32/freebsd32_syscalls.c
  user/jeff/numa/sys/compat/freebsd32/freebsd32_sysent.c
  user/jeff/numa/sys/compat/freebsd32/syscalls.master
  user/jeff/numa/sys/compat/linux/linux_emul.c
  user/jeff/numa/sys/compat/linux/linux_emul.h
  user/jeff/numa/sys/compat/linux/linux_ipc.c
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/bitops.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/compiler.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/delay.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/if_ether.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/io.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/kernel.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/ktime.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/lockdep.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/module.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/moduleparam.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/printk.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/slab.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/timer.h
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/wait.h
  user/jeff/numa/sys/compat/linuxkpi/common/src/linux_compat.c
  user/jeff/numa/sys/compat/linuxkpi/common/src/linux_schedule.c
  user/jeff/numa/sys/compat/linuxkpi/common/src/linux_slab.c
  user/jeff/numa/sys/compat/linuxkpi/common/src/linux_work.c
  user/jeff/numa/sys/conf/files
  user/jeff/numa/sys/conf/files.amd64
  user/jeff/numa/sys/conf/files.arm64
  user/jeff/numa/sys/conf/files.i386
  user/jeff/numa/sys/conf/files.powerpc
  user/jeff/numa/sys/conf/kern.mk
  user/jeff/numa/sys/conf/kern.opts.mk
  user/jeff/numa/sys/conf/kern.pre.mk
  user/jeff/numa/sys/conf/ldscript.amd64
  user/jeff/numa/sys/conf/options
  user/jeff/numa/sys/conf/options.arm64
  user/jeff/numa/sys/contrib/dev/acpica/include/actbl2.h
  user/jeff/numa/sys/contrib/zstd/programs/fileio.c
  user/jeff/numa/sys/ddb/db_script.c
  user/jeff/numa/sys/dev/acpica/acpi.c
  user/jeff/numa/sys/dev/acpica/acpi_resource.c
  user/jeff/numa/sys/dev/asmc/asmcvar.h
  user/jeff/numa/sys/dev/atkbdc/psm.c
  user/jeff/numa/sys/dev/bktr/bktr_tuner.c
  user/jeff/numa/sys/dev/cxgbe/adapter.h
  user/jeff/numa/sys/dev/cxgbe/crypto/t4_crypto.c
  user/jeff/numa/sys/dev/cxgbe/iw_cxgbe/provider.c
  user/jeff/numa/sys/dev/cxgbe/offload.h
  user/jeff/numa/sys/dev/cxgbe/t4_main.c
  user/jeff/numa/sys/dev/efidev/efirt.c   (contents, props changed)
  user/jeff/numa/sys/dev/extres/clk/clk.h
  user/jeff/numa/sys/dev/flash/mx25l.c
  user/jeff/numa/sys/dev/gpio/chvgpio.c
  user/jeff/numa/sys/dev/gpio/chvgpio_reg.h
  user/jeff/numa/sys/dev/ichiic/ig4_acpi.c
  user/jeff/numa/sys/dev/ichiic/ig4_iic.c
  user/jeff/numa/sys/dev/ichiic/ig4_pci.c
  user/jeff/numa/sys/dev/ichiic/ig4_reg.h
  user/jeff/numa/sys/dev/ichiic/ig4_var.h
  user/jeff/numa/sys/dev/iicbus/ds1307.c
  user/jeff/numa/sys/dev/iicbus/ds13rtc.c
  user/jeff/numa/sys/dev/iicbus/ds1672.c
  user/jeff/numa/sys/dev/iicbus/ds3231.c
  user/jeff/numa/sys/dev/iicbus/isl12xx.c
  user/jeff/numa/sys/dev/iicbus/nxprtc.c
  user/jeff/numa/sys/dev/iicbus/rtc8583.c
  user/jeff/numa/sys/dev/iicbus/s35390a.c
  user/jeff/numa/sys/dev/isp/isp.c
  user/jeff/numa/sys/dev/isp/isp_pci.c
  user/jeff/numa/sys/dev/isp/ispmbox.h
  user/jeff/numa/sys/dev/isp/ispvar.h
  user/jeff/numa/sys/dev/ispfw/asm_2400.h
  user/jeff/numa/sys/dev/ispfw/asm_2500.h
  user/jeff/numa/sys/dev/iwi/if_iwi.c
  user/jeff/numa/sys/dev/mlx4/mlx4_core/mlx4.h
  user/jeff/numa/sys/dev/mlx4/mlx4_ib/mlx4_ib.h
  user/jeff/numa/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c
  user/jeff/numa/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
  user/jeff/numa/sys/dev/mlx5/cq.h
  user/jeff/numa/sys/dev/mlx5/device.h
  user/jeff/numa/sys/dev/mlx5/driver.h
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_core.h
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_cq.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_fw.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_health.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_mad.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_main.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_mcg.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_mr.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_pd.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_port.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_qp.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_srq.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_uar.c
  user/jeff/numa/sys/dev/mlx5/mlx5_core/mlx5_vport.c
  user/jeff/numa/sys/dev/mlx5/mlx5_en/en.h
  user/jeff/numa/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/jeff/numa/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/jeff/numa/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/jeff/numa/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
  user/jeff/numa/sys/dev/mlx5/mlx5_ifc.h
  user/jeff/numa/sys/dev/mlx5/qp.h
  user/jeff/numa/sys/dev/mlx5/srq.h
  user/jeff/numa/sys/dev/mmc/host/dwmmc.c
  user/jeff/numa/sys/dev/mmc/host/dwmmc_rockchip.c
  user/jeff/numa/sys/dev/mmc/host/dwmmc_var.h
  user/jeff/numa/sys/dev/mpr/mpr.c
  user/jeff/numa/sys/dev/mpr/mprvar.h
  user/jeff/numa/sys/dev/mps/mps.c
  user/jeff/numa/sys/dev/mps/mpsvar.h
  user/jeff/numa/sys/dev/mthca/mthca_provider.c
  user/jeff/numa/sys/dev/ofw/ofw_fdt.c
  user/jeff/numa/sys/dev/pci/pci_user.c
  user/jeff/numa/sys/dev/sdhci/sdhci_fdt.c
  user/jeff/numa/sys/dev/uart/uart_cpu_arm64.c
  user/jeff/numa/sys/dev/uart/uart_dev_pl011.c
  user/jeff/numa/sys/dev/usb/net/if_axge.c
  user/jeff/numa/sys/dev/usb/serial/uftdi.c
  user/jeff/numa/sys/dev/vt/hw/ofwfb/ofwfb.c
  user/jeff/numa/sys/dts/arm/rpi.dts
  user/jeff/numa/sys/dts/arm/rpi2.dts
  user/jeff/numa/sys/fs/fdescfs/fdesc_vnops.c
  user/jeff/numa/sys/fs/fuse/fuse_internal.c
  user/jeff/numa/sys/gdb/gdb_packet.c
  user/jeff/numa/sys/geom/geom_io.c
  user/jeff/numa/sys/geom/journal/g_journal_ufs.c
  user/jeff/numa/sys/geom/label/g_label_ufs.c
  user/jeff/numa/sys/geom/part/g_part_gpt.c
  user/jeff/numa/sys/i386/conf/NOTES
  user/jeff/numa/sys/i386/i386/pmap.c
  user/jeff/numa/sys/i386/ibcs2/ibcs2_ipc.c
  user/jeff/numa/sys/i386/include/gdb_machdep.h
  user/jeff/numa/sys/kern/init_sysent.c
  user/jeff/numa/sys/kern/kern_cpuset.c
  user/jeff/numa/sys/kern/kern_lock.c
  user/jeff/numa/sys/kern/kern_mutex.c
  user/jeff/numa/sys/kern/kern_proc.c
  user/jeff/numa/sys/kern/kern_rwlock.c
  user/jeff/numa/sys/kern/kern_shutdown.c
  user/jeff/numa/sys/kern/kern_sx.c
  user/jeff/numa/sys/kern/kern_synch.c
  user/jeff/numa/sys/kern/kern_umtx.c
  user/jeff/numa/sys/kern/sys_generic.c
  user/jeff/numa/sys/kern/syscalls.c
  user/jeff/numa/sys/kern/syscalls.master
  user/jeff/numa/sys/kern/sysv_msg.c
  user/jeff/numa/sys/kern/sysv_sem.c
  user/jeff/numa/sys/kern/vfs_bio.c
  user/jeff/numa/sys/libkern/iconv.c
  user/jeff/numa/sys/mips/include/gdb_machdep.h
  user/jeff/numa/sys/mips/mips/support.S
  user/jeff/numa/sys/modules/dtb/allwinner/Makefile
  user/jeff/numa/sys/modules/i2c/Makefile
  user/jeff/numa/sys/modules/i2c/controllers/Makefile
  user/jeff/numa/sys/modules/i2c/iicbus/Makefile
  user/jeff/numa/sys/modules/imx/Makefile
  user/jeff/numa/sys/modules/mlx5/Makefile
  user/jeff/numa/sys/modules/mlx5ib/Makefile
  user/jeff/numa/sys/net/ethernet.h
  user/jeff/numa/sys/net/iflib.c
  user/jeff/numa/sys/net/pfvar.h
  user/jeff/numa/sys/netinet/tcp.h
  user/jeff/numa/sys/netinet/tcp_fastopen.c
  user/jeff/numa/sys/netinet/tcp_fastopen.h
  user/jeff/numa/sys/netinet/tcp_input.c
  user/jeff/numa/sys/netinet/tcp_lro.c
  user/jeff/numa/sys/netinet/tcp_output.c
  user/jeff/numa/sys/netinet/tcp_seq.h
  user/jeff/numa/sys/netinet/tcp_subr.c
  user/jeff/numa/sys/netinet/tcp_syncache.c
  user/jeff/numa/sys/netinet/tcp_syncache.h
  user/jeff/numa/sys/netinet/tcp_usrreq.c
  user/jeff/numa/sys/netinet/tcp_var.h
  user/jeff/numa/sys/netpfil/pf/pf.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/agent.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/cm_msgs.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/core_priv.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_addr.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_agent.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_cache.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_cm.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_cma.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_cq.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_device.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_iwcm.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_mad.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_multicast.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_packer.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_sa_query.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_smi.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_sysfs.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_ucm.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_ucma.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_ud_header.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_umem.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_umem_odp.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_user_mad.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/ib_verbs.c
  user/jeff/numa/sys/ofed/drivers/infiniband/core/iwcm.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/iwpm_util.h
  user/jeff/numa/sys/ofed/drivers/infiniband/core/mad_priv.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/mad_rmpp.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/opa_smi.h
  user/jeff/numa/sys/ofed/drivers/infiniband/core/sa.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/smi.h   (contents, props changed)
  user/jeff/numa/sys/ofed/drivers/infiniband/core/uverbs.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib.h
  user/jeff/numa/sys/ofed/include/rdma/ib_addr.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_cache.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_cm.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_fmr_pool.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_hdrs.h
  user/jeff/numa/sys/ofed/include/rdma/ib_mad.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_marshall.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_pack.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_pma.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_sa.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_smi.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_umem.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/ib_umem_odp.h
  user/jeff/numa/sys/ofed/include/rdma/ib_verbs.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/iw_cm.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/iw_portmap.h
  user/jeff/numa/sys/ofed/include/rdma/opa_port_info.h
  user/jeff/numa/sys/ofed/include/rdma/opa_smi.h
  user/jeff/numa/sys/ofed/include/rdma/rdma_cm.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/rdma_cm_ib.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/rdma/rdma_vt.h
  user/jeff/numa/sys/ofed/include/rdma/rdmavt_cq.h
  user/jeff/numa/sys/ofed/include/rdma/rdmavt_mr.h
  user/jeff/numa/sys/ofed/include/rdma/rdmavt_qp.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/ib_user_cm.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/ib_user_mad.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/ib_user_sa.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/ib_user_verbs.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/mlx4-abi.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/mlx5-abi.h
  user/jeff/numa/sys/ofed/include/uapi/rdma/mthca-abi.h   (contents, props changed)
  user/jeff/numa/sys/ofed/include/uapi/rdma/rdma_user_cm.h
  user/jeff/numa/sys/powerpc/aim/aim_machdep.c
  user/jeff/numa/sys/powerpc/aim/mmu_oea64.c
  user/jeff/numa/sys/powerpc/aim/moea64_native.c
  user/jeff/numa/sys/powerpc/aim/slb.c
  user/jeff/numa/sys/powerpc/aim/trap_subr64.S
  user/jeff/numa/sys/powerpc/booke/booke_machdep.c
  user/jeff/numa/sys/powerpc/booke/trap_subr.S
  user/jeff/numa/sys/powerpc/conf/GENERIC64
  user/jeff/numa/sys/powerpc/conf/MPC85XXSPE
  user/jeff/numa/sys/powerpc/conf/QORIQ64
  user/jeff/numa/sys/powerpc/include/gdb_machdep.h
  user/jeff/numa/sys/powerpc/include/platform.h
  user/jeff/numa/sys/powerpc/include/sr.h
  user/jeff/numa/sys/powerpc/include/vmparam.h
  user/jeff/numa/sys/powerpc/mpc85xx/platform_mpc85xx.c
  user/jeff/numa/sys/powerpc/ofw/ofw_machdep.c
  user/jeff/numa/sys/powerpc/ofw/ofw_real.c
  user/jeff/numa/sys/powerpc/powernv/opal.h
  user/jeff/numa/sys/powerpc/powernv/opal_pci.c
  user/jeff/numa/sys/powerpc/powernv/platform_powernv.c
  user/jeff/numa/sys/powerpc/powerpc/bus_machdep.c
  user/jeff/numa/sys/powerpc/powerpc/cpu.c
  user/jeff/numa/sys/powerpc/powerpc/genassym.c
  user/jeff/numa/sys/powerpc/powerpc/mem.c
  user/jeff/numa/sys/powerpc/powerpc/platform.c
  user/jeff/numa/sys/powerpc/powerpc/platform_if.m
  user/jeff/numa/sys/powerpc/powerpc/uma_machdep.c
  user/jeff/numa/sys/powerpc/ps3/if_glc.c
  user/jeff/numa/sys/powerpc/ps3/platform_ps3.c
  user/jeff/numa/sys/powerpc/ps3/ps3bus.c
  user/jeff/numa/sys/riscv/riscv/pmap.c
  user/jeff/numa/sys/security/mac_portacl/mac_portacl.c
  user/jeff/numa/sys/sparc64/include/gdb_machdep.h
  user/jeff/numa/sys/sys/bus.h
  user/jeff/numa/sys/sys/callout.h
  user/jeff/numa/sys/sys/dirent.h
  user/jeff/numa/sys/sys/efi.h
  user/jeff/numa/sys/sys/msg.h
  user/jeff/numa/sys/sys/param.h
  user/jeff/numa/sys/sys/sem.h
  user/jeff/numa/sys/sys/systm.h
  user/jeff/numa/sys/sys/time.h
  user/jeff/numa/sys/ufs/ffs/ffs_softdep.c
  user/jeff/numa/sys/ufs/ffs/ffs_subr.c
  user/jeff/numa/sys/ufs/ffs/ffs_vfsops.c
  user/jeff/numa/sys/vm/vm_page.c
  user/jeff/numa/sys/vm/vm_page.h
  user/jeff/numa/sys/vm/vm_pageout.c
  user/jeff/numa/sys/vm/vm_pageout.h
  user/jeff/numa/sys/vm/vm_reserv.c
  user/jeff/numa/targets/pseudo/userland/Makefile.depend
  user/jeff/numa/tools/boot/lua-lint.sh
  user/jeff/numa/usr.bin/bmake/Makefile.config
  user/jeff/numa/usr.bin/bmake/Makefile.inc
  user/jeff/numa/usr.bin/bmake/config.h
  user/jeff/numa/usr.bin/calendar/calendars/calendar.judaic
  user/jeff/numa/usr.bin/cpuset/cpuset.1
  user/jeff/numa/usr.bin/ipcrm/ipcrm.c
  user/jeff/numa/usr.bin/rctl/rctl.8
  user/jeff/numa/usr.bin/seq/Makefile
  user/jeff/numa/usr.bin/seq/seq.c
  user/jeff/numa/usr.bin/svn/lib/libapr/apr.h
  user/jeff/numa/usr.sbin/Makefile
  user/jeff/numa/usr.sbin/ntp/config.h
  user/jeff/numa/usr.sbin/ntp/doc/ntp-keygen.8
  user/jeff/numa/usr.sbin/ntp/doc/ntp.conf.5
  user/jeff/numa/usr.sbin/ntp/doc/ntp.keys.5
  user/jeff/numa/usr.sbin/ntp/doc/ntpd.8
  user/jeff/numa/usr.sbin/ntp/doc/ntpdc.8
  user/jeff/numa/usr.sbin/ntp/doc/ntpq.8
  user/jeff/numa/usr.sbin/ntp/doc/sntp.8
  user/jeff/numa/usr.sbin/ntp/ntp-keygen/Makefile
  user/jeff/numa/usr.sbin/ntp/ntptime/Makefile
  user/jeff/numa/usr.sbin/ntp/scripts/mkver
  user/jeff/numa/usr.sbin/pw/pw_user.c
  user/jeff/numa/usr.sbin/pw/tests/pw_useradd_test.sh
  user/jeff/numa/usr.sbin/rpcbind/rpcb_svc.c
  user/jeff/numa/usr.sbin/rpcbind/rpcb_svc_com.c
  user/jeff/numa/usr.sbin/spray/spray.c
  user/jeff/numa/usr.sbin/syslogd/syslogd.c
Directory Properties:
  user/jeff/numa/   (props changed)
  user/jeff/numa/cddl/   (props changed)
  user/jeff/numa/cddl/contrib/opensolaris/   (props changed)
  user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/jeff/numa/contrib/bmake/   (props changed)
  user/jeff/numa/contrib/compiler-rt/   (props changed)
  user/jeff/numa/contrib/libc++/   (props changed)
  user/jeff/numa/contrib/llvm/   (props changed)
  user/jeff/numa/contrib/llvm/tools/clang/   (props changed)
  user/jeff/numa/contrib/llvm/tools/lld/   (props changed)
  user/jeff/numa/contrib/llvm/tools/lldb/   (props changed)
  user/jeff/numa/contrib/netbsd-tests/   (props changed)
  user/jeff/numa/contrib/ntp/   (props changed)
  user/jeff/numa/contrib/sendmail/   (props changed)
  user/jeff/numa/gnu/usr.bin/binutils/   (props changed)
  user/jeff/numa/sys/cddl/contrib/opensolaris/   (props changed)
  user/jeff/numa/sys/contrib/dev/acpica/   (props changed)
  user/jeff/numa/sys/contrib/zstd/   (props changed)

Modified: user/jeff/numa/MAINTAINERS
==============================================================================
--- user/jeff/numa/MAINTAINERS	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/MAINTAINERS	Fri Mar  9 05:55:53 2018	(r330685)
@@ -86,6 +86,7 @@ sh(1)		jilles		Pre-commit review requested. This also 
 share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
 share/mk/*.test.mk	freebsd-testing,ngie (same list as share/mk too)	Pre-commit review requested.
 stand/forth		dteske	Pre-commit review requested.
+stand/lua		kevans	Pre-commit review requested
 sys/compat/linuxkpi	hselasky	If in doubt, ask.
 sys/dev/e1000	erj	Pre-commit phabricator review requested.
 sys/dev/ixgbe	erj	Pre-commit phabricator review requested.
@@ -107,3 +108,5 @@ autofs(5)	trasz	Pre-commit review recommended.
 iscsi(4)	trasz	Pre-commit review recommended.
 rctl(8)		trasz	Pre-commit review recommended.
 sys/dev/ofw	nwhitehorn	Pre-commit review recommended.
+sys/arm/allwinner	manu	Pre-commit review requested
+sys/arm64/rockchip	manu	Pre-commit review requested

Modified: user/jeff/numa/Makefile
==============================================================================
--- user/jeff/numa/Makefile	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/Makefile	Fri Mar  9 05:55:53 2018	(r330685)
@@ -195,11 +195,11 @@ PATH=	/sbin:/bin:/usr/sbin:/usr/bin
 MAKEOBJDIRPREFIX?=	/usr/obj
 _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} MK_AUTO_OBJ=no \
     ${.MAKEFLAGS:MMAKEOBJDIRPREFIX=*} __MAKE_CONF=${__MAKE_CONF} \
-    SRCCONF=${SRCCONF} \
+    SRCCONF=${SRCCONF} SRC_ENV_CONF= \
     -f /dev/null -V MAKEOBJDIRPREFIX dummy
 .if !empty(_MAKEOBJDIRPREFIX)
-.error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
-	(in make.conf(5) or src.conf(5)) or command-line variable.
+.error MAKEOBJDIRPREFIX can only be set in environment or src-env.conf(5),\
+    not as a global (in make.conf(5) or src.conf(5)) or command-line variable.
 .endif
 
 # We often need to use the tree's version of make to build it.

Modified: user/jeff/numa/Makefile.inc1
==============================================================================
--- user/jeff/numa/Makefile.inc1	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/Makefile.inc1	Fri Mar  9 05:55:53 2018	(r330685)
@@ -56,7 +56,13 @@ LOCALBASE?=	/usr/local
 # Cross toolchain changes must be in effect before bsd.compiler.mk
 # so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes.
 .if defined(CROSS_TOOLCHAIN)
+.if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk)
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.elif exists(${CROSS_TOOLCHAIN})
+.include "${CROSS_TOOLCHAIN}"
+.else
+.error CROSS_TOOLCHAIN ${CROSS_TOOLCHAIN} not found
+.endif
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
 .if defined(CROSS_TOOLCHAIN_PREFIX)

Modified: user/jeff/numa/ObsoleteFiles.inc
==============================================================================
--- user/jeff/numa/ObsoleteFiles.inc	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/ObsoleteFiles.inc	Fri Mar  9 05:55:53 2018	(r330685)
@@ -38,6 +38,10 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180306: remove DTrace scripts made obsolete by dwatch(1)
+OLD_FILES+=usr/share/dtrace/watch_execve
+OLD_FILES+=usr/share/dtrace/watch_kill
+OLD_FILES+=usr/share/dtrace/watch_vop_remove
 # 20180212: move devmatch
 OLD_FILES+=usr/sbin/devmatch
 # 20180211: remove usb.conf

Modified: user/jeff/numa/README.md
==============================================================================
--- user/jeff/numa/README.md	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/README.md	Fri Mar  9 05:55:53 2018	(r330685)
@@ -36,53 +36,53 @@ devices, not just those commonly used.
 Source Roadmap:
 ---------------
 ```
-bin				System/user commands.
+bin		System/user commands.
 
-cddl			Various commands and libraries under the Common Development  
-				and Distribution License.
+cddl		Various commands and libraries under the Common Development
+		and Distribution License.
 
-contrib			Packages contributed by 3rd parties.
+contrib		Packages contributed by 3rd parties.
 
-crypto			Cryptography stuff (see crypto/README).
+crypto		Cryptography stuff (see crypto/README).
 
-etc				Template files for /etc.
+etc		Template files for /etc.
 
-gnu				Various commands and libraries under the GNU Public License.  
-				Please see gnu/COPYING* for more information.
+gnu		Various commands and libraries under the GNU Public License.
+		Please see gnu/COPYING* for more information.
 
-include			System include files.
+include		System include files.
 
-kerberos5		Kerberos5 (Heimdal) package.
+kerberos5	Kerberos5 (Heimdal) package.
 
-lib				System libraries.
+lib		System libraries.
 
-libexec			System daemons.
+libexec		System daemons.
 
-release			Release building Makefile & associated tools.
+release		Release building Makefile & associated tools.
 
-rescue			Build system for statically linked /rescue utilities.
+rescue		Build system for statically linked /rescue utilities.
 
-sbin			System commands.
+sbin		System commands.
 
-secure			Cryptographic libraries and commands.
+secure		Cryptographic libraries and commands.
 
-share			Shared resources.
+share		Shared resources.
 
-stand			Boot loader sources.
+stand		Boot loader sources.
 
-sys				Kernel sources.
+sys		Kernel sources.
 
-tests			Regression tests which can be run by Kyua.  See tests/README
-				for additional information.
+tests		Regression tests which can be run by Kyua.  See tests/README
+		for additional information.
 
-tools			Utilities for regression testing and miscellaneous tasks.
+tools		Utilities for regression testing and miscellaneous tasks.
 
-usr.bin			User commands.
+usr.bin		User commands.
 
-usr.sbin		System administration commands.
+usr.sbin	System administration commands.
 ```
 
 For information on synchronizing your source tree with one or more of
 the FreeBSD Project's development branches, please see:
 
-   https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html
+  https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/current-stable.html

Modified: user/jeff/numa/bin/chflags/chflags.1
==============================================================================
--- user/jeff/numa/bin/chflags/chflags.1	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/bin/chflags/chflags.1	Fri Mar  9 05:55:53 2018	(r330685)
@@ -32,7 +32,7 @@
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD$
 .\"
-.Dd April 20, 2015
+.Dd March 6, 2018
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -40,7 +40,7 @@
 .Nd change file flags
 .Sh SYNOPSIS
 .Nm
-.Op Fl fhv
+.Op Fl fhvx
 .Oo
 .Fl R
 .Op Fl H | Fl L | Fl P
@@ -98,6 +98,8 @@ If the
 .Fl v
 option is specified more than once, the old and new flags of the file
 will also be printed, in octal notation.
+.It Fl x
+Do not cross mount points.
 .El
 .Pp
 The flags are specified as an octal number or a comma separated list
@@ -215,6 +217,16 @@ setting.
 See
 .Xr security 7
 for more information on this setting.
+.Pp
+If
+.Nm
+receives a
+.Dv SIGINFO
+signal (see the
+.Cm status
+argument for
+.Xr stty 1 ) ,
+then the current filename as well as the old and new flags are displayed.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO

Modified: user/jeff/numa/bin/chflags/chflags.c
==============================================================================
--- user/jeff/numa/bin/chflags/chflags.c	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/bin/chflags/chflags.c	Fri Mar  9 05:55:53 2018	(r330685)
@@ -51,13 +51,23 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+static volatile sig_atomic_t siginfo;
+
 static void usage(void);
 
+static void
+siginfo_handler(int sig __unused)
+{
+
+	siginfo = 1;
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -65,12 +75,12 @@ main(int argc, char *argv[])
 	FTSENT *p;
 	u_long clear, newflags, set;
 	long val;
-	int Hflag, Lflag, Rflag, fflag, hflag, vflag;
+	int Hflag, Lflag, Rflag, fflag, hflag, vflag, xflag;
 	int ch, fts_options, oct, rval;
 	char *flags, *ep;
 
-	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
-	while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
+	Hflag = Lflag = Rflag = fflag = hflag = vflag = xflag = 0;
+	while ((ch = getopt(argc, argv, "HLPRfhvx")) != -1)
 		switch (ch) {
 		case 'H':
 			Hflag = 1;
@@ -95,6 +105,9 @@ main(int argc, char *argv[])
 		case 'v':
 			vflag++;
 			break;
+		case 'x':
+			xflag = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -105,6 +118,8 @@ main(int argc, char *argv[])
 	if (argc < 2)
 		usage();
 
+	(void)signal(SIGINFO, siginfo_handler);
+
 	if (Rflag) {
 		if (hflag)
 			errx(1, "the -R and -h options may not be "
@@ -123,6 +138,8 @@ main(int argc, char *argv[])
 	} else {
 		fts_options = FTS_LOGICAL;
 	}
+	if (xflag)
+		fts_options |= FTS_XDEV;
 
 	flags = *argv;
 	if (*flags >= '0' && *flags <= '7') {
@@ -183,13 +200,14 @@ main(int argc, char *argv[])
 		    atflag) == -1 && !fflag) {
 			warn("%s", p->fts_path);
 			rval = 1;
-		} else if (vflag) {
+		} else if (vflag || siginfo) {
 			(void)printf("%s", p->fts_path);
-			if (vflag > 1)
+			if (vflag > 1 || siginfo)
 				(void)printf(": 0%lo -> 0%lo",
 				    (u_long)p->fts_statp->st_flags,
 				    newflags);
 			(void)printf("\n");
+			siginfo = 0;
 		}
 	}
 	if (errno)
@@ -201,6 +219,6 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: chflags [-fhv] [-R [-H | -L | -P]] flags file ...\n");
+	    "usage: chflags [-fhvx] [-R [-H | -L | -P]] flags file ...\n");
 	exit(1);
 }

Modified: user/jeff/numa/bin/ps/ps.c
==============================================================================
--- user/jeff/numa/bin/ps/ps.c	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/bin/ps/ps.c	Fri Mar  9 05:55:53 2018	(r330685)
@@ -194,10 +194,17 @@ main(int argc, char *argv[])
 	(void) setlocale(LC_ALL, "");
 	time(&now);			/* Used by routines in print.c. */
 
+	/*
+	 * Compute default output line length before processing options.
+	 * If COLUMNS is set, use it.  Otherwise, if this is part of an
+	 * interactive job (i.e. one associated with a terminal), use
+	 * the terminal width.  "Interactive" is determined by whether
+	 * any of stdout, stderr, or stdin is a terminal.  The intent
+	 * is that "ps", "ps | more", and "ps | grep" all use the same
+	 * default line length unless -w is specified.
+	 */
 	if ((cols = getenv("COLUMNS")) != NULL && *cols != '\0')
 		termwidth = atoi(cols);
-	else if (!isatty(STDOUT_FILENO))
-		termwidth = UNLIMITED;
 	else if ((ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&ws) == -1 &&
 	     ioctl(STDERR_FILENO, TIOCGWINSZ, (char *)&ws) == -1 &&
 	     ioctl(STDIN_FILENO,  TIOCGWINSZ, (char *)&ws) == -1) ||

Modified: user/jeff/numa/bin/stty/stty.1
==============================================================================
--- user/jeff/numa/bin/stty/stty.1	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/bin/stty/stty.1	Fri Mar  9 05:55:53 2018	(r330685)
@@ -32,7 +32,7 @@
 .\"     @(#)stty.1	8.4 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd October 5, 2016
+.Dd March 2, 2018
 .Dt STTY 1
 .Os
 .Sh NAME
@@ -589,7 +589,8 @@ Same as the control character
 .Ex -std
 .Sh SEE ALSO
 .Xr resizewin 1 ,
-.Xr termios 4
+.Xr termios 4 ,
+.Xr pstat 8
 .Sh STANDARDS
 The
 .Nm

Modified: user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Fri Mar  9 05:55:53 2018	(r330685)
@@ -923,6 +923,7 @@ zpool_read_label(int fd, nvlist_t **config)
 
 	free(label);
 	*config = NULL;
+	errno = ENOENT;
 	return (-1);
 }
 

Modified: user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c	Fri Mar  9 05:55:53 2018	(r330685)
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <zlib.h>
 #include <libgen.h>
+#include <sys/assfail.h>
 #include <sys/spa.h>
 #include <sys/stat.h>
 #include <sys/processor.h>

Modified: user/jeff/numa/cddl/lib/libdtrace/io.d
==============================================================================
--- user/jeff/numa/cddl/lib/libdtrace/io.d	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/cddl/lib/libdtrace/io.d	Fri Mar  9 05:55:53 2018	(r330685)
@@ -18,6 +18,8 @@
  *
  * CDDL HEADER END
  *
+ * Portions Copyright 2018 Devin Teske dteske at freebsd.org
+ *
  * $FreeBSD$
  */
 /*
@@ -32,6 +34,7 @@ typedef struct devinfo {
 	int dev_major;			/* major number */
 	int dev_minor;			/* minor number */
 	int dev_instance;		/* instance number */
+	int dev_type;			/* type of device */
 	string dev_name;		/* name of device */
 	string dev_statname;		/* name of device + instance/minor */
 	string dev_pathname;		/* pathname of device */
@@ -42,12 +45,14 @@ translator devinfo_t < struct devstat *D > {
 	dev_major = D->device_number;
 	dev_minor = D->unit_number;
 	dev_instance = 0;
+	dev_type = D->device_type;
 	dev_name = stringof(D->device_name);
 	dev_statname = stringof(D->device_name);
 	dev_pathname = stringof(D->device_name);
 };
 
 typedef struct bufinfo {
+	int b_cmd;			/* I/O operation */
 	int b_flags;			/* flags */
 	long b_bcount;			/* number of bytes */
 	caddr_t b_addr;			/* buffer address */
@@ -62,6 +67,7 @@ typedef struct bufinfo {
 
 #pragma D binding "1.0" translator
 translator bufinfo_t < struct bio *B > {
+	b_cmd = B->bio_cmd;
 	b_flags = B->bio_flags;
 	b_bcount = B->bio_bcount;
 	b_addr = B->bio_data;
@@ -105,3 +111,151 @@ inline int O_SYNC = 0x0080;
 #pragma D binding "1.1" O_SYNC
 inline int O_TRUNC = 0x0400;
 #pragma D binding "1.1" O_TRUNC
+
+/*
+ * The following inline constants can be used to examine bio_cmd of struct bio
+ * or a translated bufinfo_t.
+ */
+inline int BIO_READ =		0x01;
+#pragma D binding "1.13" BIO_READ
+inline int BIO_WRITE =		0x02;
+#pragma D binding "1.13" BIO_WRITE
+inline int BIO_DELETE =		0x03;
+#pragma D binding "1.13" BIO_DELETE
+inline int BIO_GETATTR =	0x04;
+#pragma D binding "1.13" BIO_GETATTR
+inline int BIO_FLUSH =		0x05;
+#pragma D binding "1.13" BIO_FLUSH
+inline int BIO_CMD0 =		0x06;
+#pragma D binding "1.13" BIO_CMD0
+inline int BIO_CMD1 =		0x07;
+#pragma D binding "1.13" BIO_CMD1
+inline int BIO_CMD2 =		0x08;
+#pragma D binding "1.13" BIO_CMD2
+inline int BIO_ZONE =		0x09;
+#pragma D binding "1.13" BIO_ZONE
+
+/*
+ * The following inline constants can be used to examine bio_flags of struct
+ * bio or a translated bufinfo_t.
+ */
+inline int BIO_ERROR =			0x01;
+#pragma D binding "1.13" BIO_ERROR
+inline int BIO_DONE =			0x02;
+#pragma D binding "1.13" BIO_DONE
+inline int BIO_ONQUEUE =		0x04;
+#pragma D binding "1.13" BIO_ONQUEUE
+inline int BIO_ORDERED =		0x08;
+#pragma D binding "1.13" BIO_ORDERED
+inline int BIO_UNMAPPED =		0x10;
+#pragma D binding "1.13" BIO_UNMAPPED
+inline int BIO_TRANSIENT_MAPPING =	0x20;
+#pragma D binding "1.13" BIO_TRANSIENT_MAPPING
+inline int BIO_VLIST =			0x40;
+#pragma D binding "1.13" BIO_VLIST
+
+/*
+ * The following inline constants can be used to examine device_type of struct
+ * devstat or a translated devinfo_t.
+ */
+inline int DEVSTAT_TYPE_DIRECT =	0x000;
+#pragma D binding "1.13" DEVSTAT_TYPE_DIRECT
+inline int DEVSTAT_TYPE_SEQUENTIAL =	0x001;
+#pragma D binding "1.13" DEVSTAT_TYPE_SEQUENTIAL
+inline int DEVSTAT_TYPE_PRINTER =	0x002;
+#pragma D binding "1.13" DEVSTAT_TYPE_PRINTER
+inline int DEVSTAT_TYPE_PROCESSOR =	0x003;
+#pragma D binding "1.13" DEVSTAT_TYPE_PROCESSOR
+inline int DEVSTAT_TYPE_WORM =		0x004;
+#pragma D binding "1.13" DEVSTAT_TYPE_WORM
+inline int DEVSTAT_TYPE_CDROM =		0x005;
+#pragma D binding "1.13" DEVSTAT_TYPE_CDROM
+inline int DEVSTAT_TYPE_SCANNER =	0x006;
+#pragma D binding "1.13" DEVSTAT_TYPE_SCANNER
+inline int DEVSTAT_TYPE_OPTICAL =	0x007;
+#pragma D binding "1.13" DEVSTAT_TYPE_OPTICAL
+inline int DEVSTAT_TYPE_CHANGER =	0x008;
+#pragma D binding "1.13" DEVSTAT_TYPE_CHANGER
+inline int DEVSTAT_TYPE_COMM =		0x009;
+#pragma D binding "1.13" DEVSTAT_TYPE_COMM
+inline int DEVSTAT_TYPE_ASC0 =		0x00a;
+#pragma D binding "1.13" DEVSTAT_TYPE_ASC0
+inline int DEVSTAT_TYPE_ASC1 =		0x00b;
+#pragma D binding "1.13" DEVSTAT_TYPE_ASC1
+inline int DEVSTAT_TYPE_STORARRAY =	0x00c;
+#pragma D binding "1.13" DEVSTAT_TYPE_STORARRAY
+inline int DEVSTAT_TYPE_ENCLOSURE =	0x00d;
+#pragma D binding "1.13" DEVSTAT_TYPE_ENCLOSURE
+inline int DEVSTAT_TYPE_FLOPPY =	0x00e;
+#pragma D binding "1.13" DEVSTAT_TYPE_FLOPPY
+inline int DEVSTAT_TYPE_MASK =		0x00f;
+#pragma D binding "1.13" DEVSTAT_TYPE_MASK
+inline int DEVSTAT_TYPE_IF_SCSI =	0x010;
+#pragma D binding "1.13" DEVSTAT_TYPE_IF_SCSI
+inline int DEVSTAT_TYPE_IF_IDE =	0x020;
+#pragma D binding "1.13" DEVSTAT_TYPE_IF_IDE
+inline int DEVSTAT_TYPE_IF_OTHER =	0x030;
+#pragma D binding "1.13" DEVSTAT_TYPE_IF_OTHER
+inline int DEVSTAT_TYPE_IF_MASK =	0x0f0;
+#pragma D binding "1.13" DEVSTAT_TYPE_IF_MASK
+inline int DEVSTAT_TYPE_PASS =		0x100;
+#pragma D binding "1.13" DEVSTAT_TYPE_PASS
+
+#pragma D binding "1.13" device_type_string
+inline string device_type_string[int type] =
+	type == DEVSTAT_TYPE_DIRECT ?		"DIRECT" :
+	type == DEVSTAT_TYPE_SEQUENTIAL ?	"SEQUENTIAL" :
+	type == DEVSTAT_TYPE_PRINTER ?		"PRINTER" :
+	type == DEVSTAT_TYPE_PROCESSOR ?	"PROCESSOR" :
+	type == DEVSTAT_TYPE_WORM ?		"WORM" :
+	type == DEVSTAT_TYPE_CDROM ?		"CDROM" :
+	type == DEVSTAT_TYPE_SCANNER ?		"SCANNER" :
+	type == DEVSTAT_TYPE_OPTICAL ?		"OPTICAL" :
+	type == DEVSTAT_TYPE_CHANGER ?		"CHANGER" :
+	type == DEVSTAT_TYPE_COMM ?		"COMM" :
+	type == DEVSTAT_TYPE_ASC0 ?		"ASC0" :
+	type == DEVSTAT_TYPE_ASC1 ?		"ASC1" :
+	type == DEVSTAT_TYPE_STORARRAY ?	"STORARRAY" :
+	type == DEVSTAT_TYPE_ENCLOSURE ?	"ENCLOSURE" :
+	type == DEVSTAT_TYPE_FLOPPY ?		"FLOPPY" :
+	strjoin("UNKNOWN(", strjoin(lltostr(type), ")"));
+
+#pragma D binding "1.13" device_type
+inline string device_type[int type] =
+	device_type_string[type & DEVSTAT_TYPE_MASK];
+
+#pragma D binding "1.13" device_if_string
+inline string device_if_string[int type] =
+	type == 0 ?			"ACCESS" :
+	type == DEVSTAT_TYPE_IF_SCSI ?	"SCSI" :
+	type == DEVSTAT_TYPE_IF_IDE ?	"IDE" :
+	type == DEVSTAT_TYPE_IF_OTHER ?	"OTHER" :
+	strjoin("UNKNOWN(", strjoin(lltostr(type), ")"));
+
+#pragma D binding "1.13" device_if
+inline string device_if[int type] =
+	device_if_string[type & DEVSTAT_TYPE_IF_MASK];
+
+#pragma D binding "1.13" bio_cmd_string
+inline string bio_cmd_string[int cmd] =
+	cmd == BIO_READ ?	"READ" :
+	cmd == BIO_WRITE ?	"WRITE" :
+	cmd == BIO_DELETE ?	"DELETE" :
+	cmd == BIO_GETATTR ?	"GETATTR" :
+	cmd == BIO_FLUSH ?	"FLUSH" :
+	cmd == BIO_CMD0 ?	"CMD0" :
+	cmd == BIO_CMD1 ?	"CMD1" :
+	cmd == BIO_CMD2 ?	"CMD2" :
+	cmd == BIO_ZONE ?	"ZONE" :
+	strjoin("UNKNOWN(", strjoin(lltostr(cmd), ")"));
+
+#pragma D binding "1.13" bio_flag_string
+inline string bio_flag_string[int flag] =
+	flag == BIO_ERROR ?		"ERROR" :
+	flag == BIO_DONE ?		"DONE" :
+	flag == BIO_ONQUEUE ?		"ONQUEUE" :
+	flag == BIO_ORDERED ?		"ORDERED" :
+	flag == BIO_UNMAPPED ?		"UNMAPPED" :
+	flag == BIO_TRANSIENT_MAPPING ?	"TRANSIENT_MAPPING" :
+	flag == BIO_VLIST ?		"VLIST" :
+	"";

Modified: user/jeff/numa/cddl/lib/libdtrace/signal.d
==============================================================================
--- user/jeff/numa/cddl/lib/libdtrace/signal.d	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/cddl/lib/libdtrace/signal.d	Fri Mar  9 05:55:53 2018	(r330685)
@@ -20,6 +20,7 @@
  * CDDL HEADER END
  *
  * Portions Copyright 2008 John Birrell jb at freebsd.org
+ * Portions Copyright 2018 Devin Teske dteske at freebsd.org
  *
  * $FreeBSD$
  */
@@ -86,7 +87,48 @@ inline int SIGUSR1 = 30;
 #pragma D binding "1.0" SIGUSR1
 inline int SIGUSR2 = 31;
 #pragma D binding "1.0" SIGUSR2
+inline int SIGTHR = 32;
+#pragma D binding "1.13" SIGTHR
+inline int SIGLIBRT = 33;
+#pragma D binding "1.13" SIGLIBRT
 
+#pragma D binding "1.13" signal_string
+inline string signal_string[int signal] =
+	signal == SIGHUP ?	"SIGHUP" :
+	signal == SIGINT ?	"SIGINT" :
+	signal == SIGQUIT ?	"SIGQUIT" :
+	signal == SIGILL ?	"SIGILL":
+	signal == SIGTRAP ?	"SIGTRAP" :
+	signal == SIGABRT ?	"SIGABRT" :
+	signal == SIGEMT ?	"SIGEMT" :
+	signal == SIGFPE ?	"SIGFPE" :
+	signal == SIGKILL ?	"SIGKILL" :
+	signal == SIGBUS ?	"SIGBUS" :
+	signal == SIGSEGV ?	"SIGSEGV" :
+	signal == SIGSYS ?	"SIGSYS" :
+	signal == SIGPIPE ?	"SIGPIPE" :
+	signal == SIGALRM ?	"SIGALRM" :
+	signal == SIGTERM ?	"SIGTERM" :
+	signal == SIGURG ?	"SIGURG" :
+	signal == SIGSTOP ?	"SIGSTOP" :
+	signal == SIGTSTP ?	"SIGTSTP" :
+	signal == SIGCONT ?	"SIGCONT" :
+	signal == SIGCHLD ?	"SIGCHLD" :
+	signal == SIGTTIN ?	"SIGTTIN" :
+	signal == SIGTTOU ?	"SIGTTOU" :
+	signal == SIGIO ?	"SIGIO" :
+	signal == SIGXCPU ?	"SIGXCPU" :
+	signal == SIGXFSZ ?	"SIGXFSZ" :
+	signal == SIGVTALRM ?	"SIGVTALRM" :
+	signal == SIGPROF ?	"SIGPROF" :
+	signal == SIGWINCH ?	"SIGWINCH" :
+	signal == SIGINFO ?	"SIGINFO" :
+	signal == SIGUSR1 ?	"SIGUSR1" :
+	signal == SIGUSR2 ?	"SIGUSR2" :
+	signal == SIGTHR ?	"SIGTHR" :
+	signal == SIGLIBRT ?	"SIGLIBRT" :
+	"UNKNOWN";
+
 inline int CLD_EXITED = 1;
 #pragma D binding "1.0" CLD_EXITED
 inline int CLD_KILLED = 2;
@@ -99,3 +141,13 @@ inline int CLD_STOPPED = 5;
 #pragma D binding "1.0" CLD_STOPPED
 inline int CLD_CONTINUED = 6;
 #pragma D binding "1.0" CLD_CONTINUED
+
+#pragma D binding "1.13" child_signal_string
+inline string child_signal_string[int child_signal] =
+	child_signal == CLD_EXITED ?	"child exited" :
+	child_signal == CLD_KILLED ?	"child terminated abnormally" :
+	child_signal == CLD_DUMPED ?	"child core dumped" :
+	child_signal == CLD_TRAPPED ?	"traced child trapped" :
+	child_signal == CLD_STOPPED ?	"child stopped" :
+	child_signal == CLD_CONTINUED ?	"stopped child continued" :
+	strjoin("unknown SIGCHLD code (", strjoin(lltostr(child_signal), ")"));

Modified: user/jeff/numa/cddl/usr.sbin/Makefile
==============================================================================
--- user/jeff/numa/cddl/usr.sbin/Makefile	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/cddl/usr.sbin/Makefile	Fri Mar  9 05:55:53 2018	(r330685)
@@ -3,6 +3,7 @@
 .include <src.opts.mk>
 
 SUBDIR=	${_dtrace} \
+	${_dwatch} \
 	${_lockstat} \
 	${_plockstat} \
 	${_zdb} \
@@ -23,6 +24,7 @@ _zfsd=	zfsd
 
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 _dtrace=	dtrace
+_dwatch=	dwatch
 _lockstat=	lockstat
 _plockstat=	plockstat
 .endif
@@ -30,15 +32,18 @@ _plockstat=	plockstat
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \
     ${MACHINE_CPUARCH} == "riscv"
 _dtrace=	dtrace
+_dwatch=	dwatch
 _lockstat=	lockstat
 .endif
 
 .if ${MACHINE_CPUARCH} == "mips"
 _dtrace=	dtrace
+_dwatch=	dwatch
 .endif
 
 .if ${MACHINE_CPUARCH} == "powerpc"
 _dtrace=	dtrace
+_dwatch=	dwatch
 _lockstat=	lockstat
 .endif
 

Modified: user/jeff/numa/contrib/bmake/ChangeLog
==============================================================================
--- user/jeff/numa/contrib/bmake/ChangeLog	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/contrib/bmake/ChangeLog	Fri Mar  9 05:55:53 2018	(r330685)
@@ -1,3 +1,44 @@
+2018-02-22  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20180222
+	  Merge with NetBSD make, pick up
+	  o parse.c: avoid calling sysconf for every call to loadfile
+
+2018-02-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20180218
+	  Merge with NetBSD make, pick up
+	  o var.c: Var_Set handle NULL value anytime.
+
+2018-02-12  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20180212
+	  Merge with NetBSD make, pick up
+	  o parse.c: do not treat .info as warning with -W
+
+2017-12-07  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20171207
+	  Merge with NetBSD make, pick up
+	  o var.c: Var_Append use Var_Set if var not previously set
+	    so that VAR_CMD is handled correctly.
+	    Add a suitable unit-test.
+
+2017-11-26  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION (_MAKE_VERSION): 20171126
+
+	* aclocal.m4: use AC_LINK_IFELSE for AC_C___ATTRIBUTE__
+	  since AC_TRY_COMPILE puts input inside main()
+	  which upsets modern compilers.
+
+2017-11-18  Simon J. Gerraty  <sjg at bad.crufty.net>
+
+	* VERSION: 20171118
+	  Merge with NetBSD make, pick up
+	  o var.c: do not append to variable set on command line
+	    add unit-test to catch this.
+
 2017-10-28  Simon J. Gerraty  <sjg at bad.crufty.net>
 
 	* VERSION: 20171028

Modified: user/jeff/numa/contrib/bmake/Makefile.config.in
==============================================================================
--- user/jeff/numa/contrib/bmake/Makefile.config.in	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/contrib/bmake/Makefile.config.in	Fri Mar  9 05:55:53 2018	(r330685)
@@ -15,7 +15,7 @@ LDFLAGS= @LDFLAGS@
 LIBOBJS= @LIBOBJS@
 LDADD= @LIBS@
 USE_META= @use_meta@
-FILEMON_H= @filemon_h@
+FILEMON_H?= @filemon_h@
 BMAKE_PATH_MAX?= @bmake_path_max@
 # used if MAXPATHLEN not defined
 CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX}

Modified: user/jeff/numa/contrib/bmake/VERSION
==============================================================================
--- user/jeff/numa/contrib/bmake/VERSION	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/contrib/bmake/VERSION	Fri Mar  9 05:55:53 2018	(r330685)
@@ -1,2 +1,2 @@
 # keep this compatible with sh and make
-_MAKE_VERSION=20171028
+_MAKE_VERSION=20180222

Modified: user/jeff/numa/contrib/bmake/aclocal.m4
==============================================================================
--- user/jeff/numa/contrib/bmake/aclocal.m4	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/contrib/bmake/aclocal.m4	Fri Mar  9 05:55:53 2018	(r330685)
@@ -1,5 +1,5 @@
 dnl RCSid:
-dnl	$Id: aclocal.m4,v 1.5 2003/03/06 21:21:30 sjg Exp $
+dnl	$Id: aclocal.m4,v 1.6 2017/11/26 22:39:20 sjg Exp $
 dnl
 
 dnl 
@@ -55,16 +55,21 @@ dnl
 AC_DEFUN(AC_C___ATTRIBUTE__, [
 AC_MSG_CHECKING(for __attribute__)
 AC_CACHE_VAL(ac_cv___attribute__, [
-AC_TRY_COMPILE([
+AC_LINK_IFELSE([
 #include <stdlib.h>
-],
-[
+
 static void foo(void) __attribute__ ((noreturn));
 
 static void
 foo(void)
 {
   exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+	foo();
 }
 ],
 ac_cv___attribute__=yes,

Modified: user/jeff/numa/contrib/bmake/bmake.cat1
==============================================================================
--- user/jeff/numa/contrib/bmake/bmake.cat1	Fri Mar  9 05:47:48 2018	(r330684)
+++ user/jeff/numa/contrib/bmake/bmake.cat1	Fri Mar  9 05:55:53 2018	(r330685)
@@ -1,73 +1,73 @@
-BMAKE(1)                NetBSD General Commands Manual                BMAKE(1)
+BMAKE(1)                FreeBSD General Commands Manual               BMAKE(1)
 
-NNAAMMEE
-     bbmmaakkee -- maintain program dependencies
+NAME
+     bmake -- maintain program dependencies
 
-SSYYNNOOPPSSIISS
-     bbmmaakkee [--BBeeiikkNNnnqqrrssttWWwwXX] [--CC _d_i_r_e_c_t_o_r_y] [--DD _v_a_r_i_a_b_l_e] [--dd _f_l_a_g_s]
-           [--ff _m_a_k_e_f_i_l_e] [--II _d_i_r_e_c_t_o_r_y] [--JJ _p_r_i_v_a_t_e] [--jj _m_a_x___j_o_b_s]
-           [--mm _d_i_r_e_c_t_o_r_y] [--TT _f_i_l_e] [--VV _v_a_r_i_a_b_l_e] [--vv _v_a_r_i_a_b_l_e]
-           [_v_a_r_i_a_b_l_e_=_v_a_l_u_e] [_t_a_r_g_e_t _._._.]
+SYNOPSIS
+     bmake [-BeikNnqrstWwX] [-C directory] [-D variable] [-d flags]
+           [-f makefile] [-I directory] [-J private] [-j max_jobs]
+           [-m directory] [-T file] [-V variable] [-v variable]
+           [variable=value] [target ...]
 
-DDEESSCCRRIIPPTTIIOONN
-     bbmmaakkee is a program designed to simplify the maintenance of other pro-
+DESCRIPTION
+     bmake is a program designed to simplify the maintenance of other pro-
      grams.  Its input is a list of specifications as to the files upon which
-     programs and other files depend.  If no --ff _m_a_k_e_f_i_l_e makefile option is
-     given, bbmmaakkee will try to open `_m_a_k_e_f_i_l_e' then `_M_a_k_e_f_i_l_e' in order to find
-     the specifications.  If the file `_._d_e_p_e_n_d' exists, it is read (see
+     programs and other files depend.  If no -f makefile makefile option is
+     given, bmake will try to open `makefile' then `Makefile' in order to find
+     the specifications.  If the file `.depend' exists, it is read (see
      mkdep(1)).
 
      This manual page is intended as a reference document only.  For a more
-     thorough description of bbmmaakkee and makefiles, please refer to _P_M_a_k_e _- _A
-     _T_u_t_o_r_i_a_l.
+     thorough description of bmake and makefiles, please refer to PMake - A
+     Tutorial.
 
-     bbmmaakkee will prepend the contents of the _M_A_K_E_F_L_A_G_S environment variable to
+     bmake will prepend the contents of the MAKEFLAGS environment variable to
      the command line arguments before parsing them.
 
      The options are as follows:
 
-     --BB      Try to be backwards compatible by executing a single shell per
+     -B      Try to be backwards compatible by executing a single shell per
              command and by executing the commands to make the sources of a
              dependency line in sequence.
 
-     --CC _d_i_r_e_c_t_o_r_y
-             Change to _d_i_r_e_c_t_o_r_y before reading the makefiles or doing any-
-             thing else.  If multiple --CC options are specified, each is inter-
-             preted relative to the previous one: --CC _/ --CC _e_t_c is equivalent to
-             --CC _/_e_t_c.
+     -C directory
+             Change to directory before reading the makefiles or doing any-
+             thing else.  If multiple -C options are specified, each is inter-
+             preted relative to the previous one: -C / -C etc is equivalent to
+             -C /etc.
 
-     --DD _v_a_r_i_a_b_l_e
-             Define _v_a_r_i_a_b_l_e to be 1, in the global context.
+     -D variable
+             Define variable to be 1, in the global context.
 
-     --dd _[_-_]_f_l_a_g_s
-             Turn on debugging, and specify which portions of bbmmaakkee are to
+     -d [-]flags
+             Turn on debugging, and specify which portions of bmake are to
              print debugging information.  Unless the flags are preceded by
-             `-' they are added to the _M_A_K_E_F_L_A_G_S environment variable and will
+             `-' they are added to the MAKEFLAGS environment variable and will
              be processed by any child make processes.  By default, debugging
              information is printed to standard error, but this can be changed
-             using the _F debugging flag.  The debugging output is always
+             using the F debugging flag.  The debugging output is always
              unbuffered; in addition, if debugging is enabled but debugging
              output is not directed to standard output, then the standard out-
-             put is line buffered.  _F_l_a_g_s is one or more of the following:
+             put is line buffered.  Flags is one or more of the following:
 
-             _A       Print all possible debugging information; equivalent to
+             A       Print all possible debugging information; equivalent to
                      specifying all of the debugging flags.
 
-             _a       Print debugging information about archive searching and
+             a       Print debugging information about archive searching and
                      caching.
 
-             _C       Print debugging information about current working direc-
+             C       Print debugging information about current working direc-
                      tory.
 
-             _c       Print debugging information about conditional evaluation.
+             c       Print debugging information about conditional evaluation.
 
-             _d       Print debugging information about directory searching and
+             d       Print debugging information about directory searching and
                      caching.
 
-             _e       Print debugging information about failed commands and
+             e       Print debugging information about failed commands and
                      targets.
 
-             _F[++]_f_i_l_e_n_a_m_e
+             F[+]filename
                      Specify where debugging output is written.  This must be
                      the last flag, because it consumes the remainder of the
                      argument.  If the character immediately after the `F'
@@ -80,80 +80,80 @@ DDEESSCCRRIIPPTTIIOONN
                      named file.  If the file name ends `.%d' then the `%d' is
                      replaced by the pid.
 
-             _f       Print debugging information about loop evaluation.
+             f       Print debugging information about loop evaluation.
 
-             _g_1      Print the input graph before making anything.
+             g1      Print the input graph before making anything.
 
-             _g_2      Print the input graph after making everything, or before
+             g2      Print the input graph after making everything, or before
                      exiting on error.
 
-             _g_3      Print the input graph before exiting on error.
+             g3      Print the input graph before exiting on error.
 
-             _j       Print debugging information about running multiple
+             j       Print debugging information about running multiple
                      shells.
 
-             _l       Print commands in Makefiles regardless of whether or not
+             l       Print commands in Makefiles regardless of whether or not
                      they are prefixed by `@' or other "quiet" flags.  Also
                      known as "loud" behavior.
 
-             _M       Print debugging information about "meta" mode decisions
+             M       Print debugging information about "meta" mode decisions
                      about targets.
 
-             _m       Print debugging information about making targets, includ-
+             m       Print debugging information about making targets, includ-
                      ing modification dates.
 
-             _n       Don't delete the temporary command scripts created when
+             n       Don't delete the temporary command scripts created when
                      running commands.  These temporary scripts are created in
                      the directory referred to by the TMPDIR environment vari-
-                     able, or in _/_t_m_p if TMPDIR is unset or set to the empty
+                     able, or in /tmp if TMPDIR is unset or set to the empty
                      string.  The temporary scripts are created by mkstemp(3),
-                     and have names of the form _m_a_k_e_X_X_X_X_X_X.  _N_O_T_E: This can
-                     create many files in TMPDIR or _/_t_m_p, so use with care.
+                     and have names of the form makeXXXXXX.  NOTE: This can
+                     create many files in TMPDIR or /tmp, so use with care.
 
-             _p       Print debugging information about makefile parsing.
+             p       Print debugging information about makefile parsing.
 
-             _s       Print debugging information about suffix-transformation
+             s       Print debugging information about suffix-transformation
                      rules.
 
-             _t       Print debugging information about target list mainte-
+             t       Print debugging information about target list mainte-
                      nance.
 
-             _V       Force the --VV option to print raw values of variables,
+             V       Force the -V option to print raw values of variables,
                      overriding the default behavior set via
-                     _._M_A_K_E_._E_X_P_A_N_D___V_A_R_I_A_B_L_E_S.
+                     .MAKE.EXPAND_VARIABLES.
 
-             _v       Print debugging information about variable assignment.
+             v       Print debugging information about variable assignment.
 
-             _x       Run shell commands with --xx so the actual commands are
+             x       Run shell commands with -x so the actual commands are
                      printed as they are executed.
 
-     --ee      Specify that environment variables override macro assignments
+     -e      Specify that environment variables override macro assignments
              within makefiles.
 
-     --ff _m_a_k_e_f_i_l_e
-             Specify a makefile to read instead of the default `_m_a_k_e_f_i_l_e'.  If
-             _m_a_k_e_f_i_l_e is `--', standard input is read.  Multiple makefiles may
+     -f makefile
+             Specify a makefile to read instead of the default `makefile'.  If
+             makefile is `-', standard input is read.  Multiple makefiles may
              be specified, and are read in the order specified.
 
-     --II _d_i_r_e_c_t_o_r_y
+     -I directory
              Specify a directory in which to search for makefiles and included
              makefiles.  The system makefile directory (or directories, see
-             the --mm option) is automatically included as part of this list.
+             the -m option) is automatically included as part of this list.
 
-     --ii      Ignore non-zero exit of shell commands in the makefile.  Equiva-
-             lent to specifying `--' before each command line in the makefile.
+     -i      Ignore non-zero exit of shell commands in the makefile.  Equiva-
+             lent to specifying `-' before each command line in the makefile.
 
-     --JJ _p_r_i_v_a_t_e
-             This option should _n_o_t be specified by the user.
+     -J private
+             This option should not be specified by the user.
 
-             When the _j option is in use in a recursive build, this option is
+             When the j option is in use in a recursive build, this option is
              passed by a make to child makes to allow all the make processes
              in the build to cooperate to avoid overloading the system.
 
-     --jj _m_a_x___j_o_b_s
-             Specify the maximum number of jobs that bbmmaakkee may have running at
-             any one time.  The value is saved in _._M_A_K_E_._J_O_B_S.  Turns compati-
-             bility mode off, unless the _B flag is also specified.  When com-
+     -j max_jobs
+             Specify the maximum number of jobs that bmake may have running at
+             any one time.  The value is saved in .MAKE.JOBS.  Turns compati-
+             bility mode off, unless the B flag is also specified.  When com-
              patibility mode is off, all commands associated with a target are
              executed in a single shell invocation as opposed to the tradi-
              tional one shell invocation per line.  This can break traditional
@@ -162,90 +162,90 @@ DDEESSCCRRIIPPTTIIOONN
              It is more efficient to correct the scripts rather than turn
              backwards compatibility on.
 
-     --kk      Continue processing after errors are encountered, but only on
+     -k      Continue processing after errors are encountered, but only on
              those targets that do not depend on the target whose creation
              caused the error.
 
-     --mm _d_i_r_e_c_t_o_r_y
+     -m directory
              Specify a directory in which to search for sys.mk and makefiles
-             included via the <_f_i_l_e>-style include statement.  The --mm option
+             included via the <file>-style include statement.  The -m option
              can be used multiple times to form a search path.  This path will
              override the default system include path: /usr/share/mk.  Fur-
              thermore the system include path will be appended to the search
-             path used for "_f_i_l_e"-style include statements (see the --II
+             path used for "file"-style include statements (see the -I
              option).
 
-             If a file or directory name in the --mm argument (or the
+             If a file or directory name in the -m argument (or the
              MAKESYSPATH environment variable) starts with the string ".../"

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


More information about the svn-src-user mailing list