From owner-svn-src-user@freebsd.org  Fri Mar  9 22:52:57 2018
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4AA7DF2D474
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Fri,  9 Mar 2018 22:52:57 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id F0C5571F89;
 Fri,  9 Mar 2018 22:52:56 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D29E0254FE;
 Fri,  9 Mar 2018 22:52:56 +0000 (UTC)
 (envelope-from markj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w29Mqud7073231;
 Fri, 9 Mar 2018 22:52:56 GMT (envelope-from markj@FreeBSD.org)
Received: (from markj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w29MqrMS073189;
 Fri, 9 Mar 2018 22:52:53 GMT (envelope-from markj@FreeBSD.org)
Message-Id: <201803092252.w29MqrMS073189@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: markj set sender to
 markj@FreeBSD.org using -f
From: Mark Johnston <markj@FreeBSD.org>
Date: Fri, 9 Mar 2018 22:52:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r330707 - in user/markj/netdump: . bin/chflags
 cddl/usr.sbin cddl/usr.sbin/dwatch contrib/llvm/lib/Target/ARM etc etc/mtree
 include lib/libc/arm lib/libc/mips lib/libc/riscv lib/libc/rp...
X-SVN-Group: user
X-SVN-Commit-Author: markj
X-SVN-Commit-Paths: in user/markj/netdump: . bin/chflags cddl/usr.sbin
 cddl/usr.sbin/dwatch contrib/llvm/lib/Target/ARM etc etc/mtree include
 lib/libc/arm lib/libc/mips lib/libc/riscv lib/libc/rpc lib/libc/softfloat
 lib/...
X-SVN-Commit-Revision: 330707
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Mar 2018 22:52:57 -0000

Author: markj
Date: Fri Mar  9 22:52:52 2018
New Revision: 330707
URL: https://svnweb.freebsd.org/changeset/base/330707

Log:
  MFH at r330706.

Added:
  user/markj/netdump/cddl/usr.sbin/dwatch/
     - copied from r330706, head/cddl/usr.sbin/dwatch/
  user/markj/netdump/libexec/tftpd/tests/
     - copied from r330706, head/libexec/tftpd/tests/
  user/markj/netdump/share/man/man4/mlx5io.4
     - copied unchanged from r330706, head/share/man/man4/mlx5io.4
  user/markj/netdump/sys/arm/conf/GENERIC-MMCCAM
     - copied unchanged from r330706, head/sys/arm/conf/GENERIC-MMCCAM
  user/markj/netdump/sys/dev/mlx5/cmd.h
     - copied unchanged from r330706, head/sys/dev/mlx5/cmd.h
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
     - copied unchanged from r330706, head/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
     - copied unchanged from r330706, head/sys/dev/mlx5/mlx5_core/mlx5_fwdump_regmaps.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
     - copied unchanged from r330706, head/sys/dev/mlx5/mlx5_core/mlx5_vsc.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
     - copied unchanged from r330706, head/sys/dev/mlx5/mlx5_ib/mlx5_ib_cong.c
  user/markj/netdump/sys/dev/mlx5/mlx5io.h
     - copied unchanged from r330706, head/sys/dev/mlx5/mlx5io.h
  user/markj/netdump/sys/dev/mlx5/port.h
     - copied unchanged from r330706, head/sys/dev/mlx5/port.h
  user/markj/netdump/sys/dev/pci/pci_host_generic_acpi.c
     - copied unchanged from r330706, head/sys/dev/pci/pci_host_generic_acpi.c
  user/markj/netdump/sys/modules/i2c/ds1672/
     - copied from r330706, head/sys/modules/i2c/ds1672/
  user/markj/netdump/tools/build/options/WITHOUT_MLX5TOOL
     - copied unchanged from r330706, head/tools/build/options/WITHOUT_MLX5TOOL
  user/markj/netdump/tools/build/options/WITH_MLX5TOOL
     - copied unchanged from r330706, head/tools/build/options/WITH_MLX5TOOL
  user/markj/netdump/usr.sbin/mlx5tool/
     - copied from r330706, head/usr.sbin/mlx5tool/
Deleted:
  user/markj/netdump/share/dtrace/watch_execve
  user/markj/netdump/share/dtrace/watch_kill
  user/markj/netdump/share/dtrace/watch_vop_remove
Modified:
  user/markj/netdump/ObsoleteFiles.inc
  user/markj/netdump/bin/chflags/chflags.1
  user/markj/netdump/bin/chflags/chflags.c
  user/markj/netdump/cddl/usr.sbin/Makefile
  user/markj/netdump/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  user/markj/netdump/etc/devd.conf
  user/markj/netdump/etc/mtree/BSD.include.dist
  user/markj/netdump/etc/mtree/BSD.usr.dist
  user/markj/netdump/include/Makefile
  user/markj/netdump/lib/libc/arm/Symbol.map
  user/markj/netdump/lib/libc/mips/Symbol.map
  user/markj/netdump/lib/libc/riscv/Symbol.map
  user/markj/netdump/lib/libc/rpc/des_crypt.3
  user/markj/netdump/lib/libc/softfloat/Symbol.map
  user/markj/netdump/lib/libmagic/Makefile
  user/markj/netdump/libexec/rpc.sprayd/Makefile
  user/markj/netdump/libexec/rpc.sprayd/sprayd.c
  user/markj/netdump/libexec/tftpd/Makefile
  user/markj/netdump/sbin/ipfw/tables.c
  user/markj/netdump/sbin/mount/mount.c
  user/markj/netdump/share/dtrace/Makefile
  user/markj/netdump/share/man/man4/Makefile
  user/markj/netdump/share/man/man4/psm.4
  user/markj/netdump/share/man/man5/periodic.conf.5
  user/markj/netdump/share/man/man5/src.conf.5
  user/markj/netdump/share/man/man8/diskless.8
  user/markj/netdump/share/man/man9/fpu_kern.9
  user/markj/netdump/share/man/man9/g_bio.9
  user/markj/netdump/share/man/man9/style.9
  user/markj/netdump/share/misc/committers-src.dot
  user/markj/netdump/share/mk/src.opts.mk
  user/markj/netdump/stand/defaults/loader.conf.5
  user/markj/netdump/stand/ficl/Makefile
  user/markj/netdump/stand/liblua/lutils.c
  user/markj/netdump/stand/loader.mk
  user/markj/netdump/stand/lua/cli.lua
  user/markj/netdump/stand/lua/config.lua
  user/markj/netdump/stand/lua/core.lua
  user/markj/netdump/stand/lua/menu.lua
  user/markj/netdump/sys/amd64/amd64/db_interface.c
  user/markj/netdump/sys/amd64/amd64/gdb_machdep.c
  user/markj/netdump/sys/amd64/amd64/initcpu.c
  user/markj/netdump/sys/amd64/amd64/mpboot.S
  user/markj/netdump/sys/amd64/amd64/pmap.c
  user/markj/netdump/sys/amd64/include/cpu.h
  user/markj/netdump/sys/amd64/include/gdb_machdep.h
  user/markj/netdump/sys/amd64/include/vmm.h
  user/markj/netdump/sys/amd64/vmm/intel/vmx.c
  user/markj/netdump/sys/arm/allwinner/aw_usbphy.c
  user/markj/netdump/sys/arm/include/gdb_machdep.h
  user/markj/netdump/sys/arm/nvidia/tegra_sdhci.c
  user/markj/netdump/sys/arm64/arm64/gic_v3_acpi.c
  user/markj/netdump/sys/arm64/arm64/gicv3_its.c
  user/markj/netdump/sys/arm64/arm64/nexus.c
  user/markj/netdump/sys/arm64/arm64/pmap.c
  user/markj/netdump/sys/arm64/include/intr.h
  user/markj/netdump/sys/arm64/include/param.h
  user/markj/netdump/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/markj/netdump/sys/cddl/dev/fbt/x86/fbt_isa.c
  user/markj/netdump/sys/compat/cloudabi/cloudabi_fd.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_syscalls.c
  user/markj/netdump/sys/compat/freebsd32/freebsd32_sysent.c
  user/markj/netdump/sys/compat/freebsd32/syscalls.master
  user/markj/netdump/sys/compat/linuxkpi/common/include/linux/if_ether.h
  user/markj/netdump/sys/compat/linuxkpi/common/src/linux_compat.c
  user/markj/netdump/sys/conf/files
  user/markj/netdump/sys/conf/files.arm64
  user/markj/netdump/sys/conf/kern.pre.mk
  user/markj/netdump/sys/conf/ldscript.amd64
  user/markj/netdump/sys/contrib/zstd/programs/fileio.c
  user/markj/netdump/sys/dev/acpica/acpi.c
  user/markj/netdump/sys/dev/asmc/asmcvar.h
  user/markj/netdump/sys/dev/atkbdc/psm.c
  user/markj/netdump/sys/dev/bktr/bktr_tuner.c
  user/markj/netdump/sys/dev/bwn/if_bwn.c
  user/markj/netdump/sys/dev/ichiic/ig4_acpi.c
  user/markj/netdump/sys/dev/ichiic/ig4_iic.c
  user/markj/netdump/sys/dev/ichiic/ig4_pci.c
  user/markj/netdump/sys/dev/ichiic/ig4_reg.h
  user/markj/netdump/sys/dev/ichiic/ig4_var.h
  user/markj/netdump/sys/dev/iicbus/ds1672.c
  user/markj/netdump/sys/dev/iwi/if_iwi.c
  user/markj/netdump/sys/dev/mlx4/mlx4_core/mlx4.h
  user/markj/netdump/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c
  user/markj/netdump/sys/dev/mlx5/cq.h
  user/markj/netdump/sys/dev/mlx5/device.h
  user/markj/netdump/sys/dev/mlx5/driver.h
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_cmd.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_core.h
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_cq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fs_cmd.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_fw.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_health.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_mad.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_main.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_mcg.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_mr.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_pagealloc.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_pd.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_port.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_qp.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_srq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_transobj.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_uar.c
  user/markj/netdump/sys/dev/mlx5/mlx5_core/mlx5_vport.c
  user/markj/netdump/sys/dev/mlx5/mlx5_en/en.h
  user/markj/netdump/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  user/markj/netdump/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  user/markj/netdump/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  user/markj/netdump/sys/dev/mlx5/mlx5_en/mlx5_en_txrx.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib.h
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c
  user/markj/netdump/sys/dev/mlx5/mlx5_ifc.h
  user/markj/netdump/sys/dev/mlx5/qp.h
  user/markj/netdump/sys/dev/mlx5/srq.h
  user/markj/netdump/sys/dev/ral/rt2560.c
  user/markj/netdump/sys/dev/ral/rt2661.c
  user/markj/netdump/sys/dev/sdhci/sdhci_fdt.c
  user/markj/netdump/sys/dev/usb/wlan/if_rum.c
  user/markj/netdump/sys/dev/usb/wlan/if_run.c
  user/markj/netdump/sys/dev/usb/wlan/if_ural.c
  user/markj/netdump/sys/dev/vt/hw/ofwfb/ofwfb.c
  user/markj/netdump/sys/fs/fdescfs/fdesc_vnops.c
  user/markj/netdump/sys/gdb/gdb_packet.c
  user/markj/netdump/sys/geom/part/g_part_gpt.c
  user/markj/netdump/sys/i386/ibcs2/ibcs2_ipc.c
  user/markj/netdump/sys/i386/include/gdb_machdep.h
  user/markj/netdump/sys/kern/init_sysent.c
  user/markj/netdump/sys/kern/kern_cpuset.c
  user/markj/netdump/sys/kern/kern_shutdown.c
  user/markj/netdump/sys/kern/kern_umtx.c
  user/markj/netdump/sys/kern/syscalls.c
  user/markj/netdump/sys/kern/syscalls.master
  user/markj/netdump/sys/mips/include/gdb_machdep.h
  user/markj/netdump/sys/mips/mips/support.S
  user/markj/netdump/sys/modules/i2c/Makefile
  user/markj/netdump/sys/modules/mlx5/Makefile
  user/markj/netdump/sys/modules/mlx5ib/Makefile
  user/markj/netdump/sys/net/ethernet.h
  user/markj/netdump/sys/net80211/ieee80211_output.c
  user/markj/netdump/sys/net80211/ieee80211_proto.h
  user/markj/netdump/sys/netinet/tcp_lro.c
  user/markj/netdump/sys/netinet/tcp_seq.h
  user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_addr.c
  user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_cm.c
  user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_cma.c
  user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_mad.c
  user/markj/netdump/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c
  user/markj/netdump/sys/ofed/include/rdma/ib_verbs.h
  user/markj/netdump/sys/powerpc/aim/aim_machdep.c
  user/markj/netdump/sys/powerpc/aim/mmu_oea64.c
  user/markj/netdump/sys/powerpc/aim/moea64_native.c
  user/markj/netdump/sys/powerpc/aim/slb.c
  user/markj/netdump/sys/powerpc/aim/trap_subr64.S
  user/markj/netdump/sys/powerpc/include/gdb_machdep.h
  user/markj/netdump/sys/powerpc/include/sr.h
  user/markj/netdump/sys/powerpc/include/vmparam.h
  user/markj/netdump/sys/powerpc/ofw/ofw_machdep.c
  user/markj/netdump/sys/powerpc/ofw/ofw_real.c
  user/markj/netdump/sys/powerpc/powernv/opal_pci.c
  user/markj/netdump/sys/powerpc/powernv/platform_powernv.c
  user/markj/netdump/sys/powerpc/powerpc/bus_machdep.c
  user/markj/netdump/sys/powerpc/powerpc/genassym.c
  user/markj/netdump/sys/powerpc/powerpc/mem.c
  user/markj/netdump/sys/powerpc/powerpc/uma_machdep.c
  user/markj/netdump/sys/powerpc/ps3/platform_ps3.c
  user/markj/netdump/sys/sparc64/include/gdb_machdep.h
  user/markj/netdump/sys/vm/vm_reserv.c
  user/markj/netdump/targets/pseudo/userland/Makefile.depend
  user/markj/netdump/tools/boot/lua-lint.sh
  user/markj/netdump/usr.bin/calendar/calendars/calendar.judaic
  user/markj/netdump/usr.sbin/Makefile
  user/markj/netdump/usr.sbin/spray/spray.c
Directory Properties:
  user/markj/netdump/   (props changed)
  user/markj/netdump/cddl/   (props changed)
  user/markj/netdump/contrib/llvm/   (props changed)
  user/markj/netdump/sys/cddl/contrib/opensolaris/   (props changed)
  user/markj/netdump/sys/contrib/dev/acpica/   (props changed)
  user/markj/netdump/sys/contrib/zstd/   (props changed)

Modified: user/markj/netdump/ObsoleteFiles.inc
==============================================================================
--- user/markj/netdump/ObsoleteFiles.inc	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/ObsoleteFiles.inc	Fri Mar  9 22:52:52 2018	(r330707)
@@ -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/markj/netdump/bin/chflags/chflags.1
==============================================================================
--- user/markj/netdump/bin/chflags/chflags.1	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/bin/chflags/chflags.1	Fri Mar  9 22:52:52 2018	(r330707)
@@ -32,7 +32,7 @@
 .\"	@(#)chflags.1	8.4 (Berkeley) 5/2/95
 .\" $FreeBSD$
 .\"
-.Dd March 4, 2018
+.Dd March 6, 2018
 .Dt CHFLAGS 1
 .Os
 .Sh NAME
@@ -217,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/markj/netdump/bin/chflags/chflags.c
==============================================================================
--- user/markj/netdump/bin/chflags/chflags.c	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/bin/chflags/chflags.c	Fri Mar  9 22:52:52 2018	(r330707)
@@ -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[])
 {
@@ -108,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 "
@@ -188,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)

Modified: user/markj/netdump/cddl/usr.sbin/Makefile
==============================================================================
--- user/markj/netdump/cddl/usr.sbin/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/cddl/usr.sbin/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -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/markj/netdump/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
==============================================================================
--- user/markj/netdump/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp	Fri Mar  9 22:52:52 2018	(r330707)
@@ -10201,7 +10201,14 @@ static SDValue PerformSHLSimplify(SDNode *N,
     case ISD::XOR:
     case ISD::SETCC:
     case ARMISD::CMP:
-      // Check that its not already using a shl.
+      // Check that the user isn't already using a constant because there
+      // aren't any instructions that support an immediate operand and a
+      // shifted operand.
+      if (isa<ConstantSDNode>(U->getOperand(0)) ||
+          isa<ConstantSDNode>(U->getOperand(1)))
+        return SDValue();
+
+      // Check that it's not already using a shift.
       if (U->getOperand(0).getOpcode() == ISD::SHL ||
           U->getOperand(1).getOpcode() == ISD::SHL)
         return SDValue();
@@ -10223,8 +10230,6 @@ static SDValue PerformSHLSimplify(SDNode *N,
   if (!C1ShlC2 || !C2)
     return SDValue();
 
-  DEBUG(dbgs() << "Trying to simplify shl: "; N->dump());
-
   APInt C2Int = C2->getAPIntValue();
   APInt C1Int = C1ShlC2->getAPIntValue();
 
@@ -10238,12 +10243,12 @@ static SDValue PerformSHLSimplify(SDNode *N,
   C1Int.lshrInPlace(C2Int);
 
   // The immediates are encoded as an 8-bit value that can be rotated.
-  unsigned Zeros = C1Int.countLeadingZeros() + C1Int.countTrailingZeros();
-  if (C1Int.getBitWidth() - Zeros > 8)
-    return SDValue();
+  auto LargeImm = [](const APInt &Imm) {
+    unsigned Zeros = Imm.countLeadingZeros() + Imm.countTrailingZeros();
+    return Imm.getBitWidth() - Zeros > 8;
+  };
 
-  Zeros = C2Int.countLeadingZeros() + C2Int.countTrailingZeros();
-  if (C2Int.getBitWidth() - Zeros > 8)
+  if (LargeImm(C1Int) || LargeImm(C2Int))
     return SDValue();
 
   SelectionDAG &DAG = DCI.DAG;
@@ -10253,6 +10258,10 @@ static SDValue PerformSHLSimplify(SDNode *N,
                               DAG.getConstant(C1Int, dl, MVT::i32));
   // Shift left to compensate for the lshr of C1Int.
   SDValue Res = DAG.getNode(ISD::SHL, dl, MVT::i32, BinOp, SHL.getOperand(1));
+
+  DEBUG(dbgs() << "Simplify shl use:\n"; SHL.getOperand(0).dump(); SHL.dump();
+        N->dump());
+  DEBUG(dbgs() << "Into:\n"; X.dump(); BinOp.dump(); Res.dump());
 
   DAG.ReplaceAllUsesWith(SDValue(N, 0), Res);
   return SDValue(N, 0);

Modified: user/markj/netdump/etc/devd.conf
==============================================================================
--- user/markj/netdump/etc/devd.conf	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/etc/devd.conf	Fri Mar  9 22:52:52 2018	(r330707)
@@ -339,4 +339,15 @@ notify 10 {
 	action "logger $comm $core";
 };
 
+# Let the init(8) know there's a new USB serial interface it might
+# want to run getty(8) for.  This includes device-side tty created
+# by usb_template(4).
+notify 100 {
+	match "system"		"DEVFS";
+	match "subsystem"	"CDEV";
+	match "type"		"CREATE";
+	match "cdev"		"ttyU[0-9]+";
+	action "/sbin/init q";
+};
+
 */

Modified: user/markj/netdump/etc/mtree/BSD.include.dist
==============================================================================
--- user/markj/netdump/etc/mtree/BSD.include.dist	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/etc/mtree/BSD.include.dist	Fri Mar  9 22:52:52 2018	(r330707)
@@ -132,6 +132,8 @@
         ..
         mfi
         ..
+        mlx5
+        ..
         mmc
         ..
         mpt

Modified: user/markj/netdump/etc/mtree/BSD.usr.dist
==============================================================================
--- user/markj/netdump/etc/mtree/BSD.usr.dist	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/etc/mtree/BSD.usr.dist	Fri Mar  9 22:52:52 2018	(r330707)
@@ -122,6 +122,8 @@
         ..
         bsdinstall
         ..
+        dwatch
+        ..
         hyperv
         ..
         lpr
@@ -236,6 +238,8 @@
             dma
             ..
             drivers
+            ..
+            dwatch
             ..
             etc
                 defaults

Modified: user/markj/netdump/include/Makefile
==============================================================================
--- user/markj/netdump/include/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/include/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -256,6 +256,11 @@ copies: .PHONY .META
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
 	    ${SDESTDIR}${INCLUDEDIR}/sys
 .endif
+.if ${MK_MLX5TOOL} != "no"
+	cd ${SRCTOP}/sys/dev/mlx5; \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 mlx5io.h \
+	    ${SDESTDIR}${INCLUDEDIR}/dev/mlx5
+.endif
 
 symlinks: .PHONY .META
 	@${ECHO} "Setting up symlinks to kernel source tree..."
@@ -385,6 +390,10 @@ symlinks: .PHONY .META
 		${INSTALL_SYMLINK} ${TAG_ARGS} ../../../sys/rpc/$$h \
 		    ${SDESTDIR}${INCLUDEDIR}/rpc; \
 	done
+.if ${MK_MLX5TOOL} != "no"
+	${INSTALL_SYMLINK} ${TAG_ARGS} ../../../../sys/dev/mlx5/mlx5io.h \
+	    ${SDESTDIR}${INCLUDEDIR}/dev/mlx5
+.endif
 
 .include <bsd.prog.mk>
 

Modified: user/markj/netdump/lib/libc/arm/Symbol.map
==============================================================================
--- user/markj/netdump/lib/libc/arm/Symbol.map	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libc/arm/Symbol.map	Fri Mar  9 22:52:52 2018	(r330707)
@@ -61,23 +61,5 @@ FBSDprivate_1.0 {
 	_end;
 	_sbrk;
 
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
-
 	_libc_arm_fpu_present;
 };

Modified: user/markj/netdump/lib/libc/mips/Symbol.map
==============================================================================
--- user/markj/netdump/lib/libc/mips/Symbol.map	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libc/mips/Symbol.map	Fri Mar  9 22:52:52 2018	(r330707)
@@ -53,22 +53,4 @@ FBSDprivate_1.0 {
 	_end;
 	_brk;
 	_sbrk;
-
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
 };

Modified: user/markj/netdump/lib/libc/riscv/Symbol.map
==============================================================================
--- user/markj/netdump/lib/libc/riscv/Symbol.map	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libc/riscv/Symbol.map	Fri Mar  9 22:52:52 2018	(r330707)
@@ -35,22 +35,4 @@ FBSDprivate_1.0 {
 	_set_tp;
 	_end;
 	__makecontext;
-
-	/* softfloat */
-	__addsf3;
-	__adddf3;
-	__subsf3;
-	__subdf3;
-	__mulsf3;
-	__muldf3;
-	__divsf3;
-	__divdf3;
-	__floatsisf;
-	__floatsidf;
-	__fixsfsi;
-	__fixdfsi;
-	__fixunssfsi;
-	__fixunsdfsi;
-	__extendsfdf2;
-	__truncdfsf2;
 };

Modified: user/markj/netdump/lib/libc/rpc/des_crypt.3
==============================================================================
--- user/markj/netdump/lib/libc/rpc/des_crypt.3	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libc/rpc/des_crypt.3	Fri Mar  9 22:52:52 2018	(r330707)
@@ -108,7 +108,7 @@ vector upon return.
 No error.
 .It Bq Er DESERR_NOHWDEVICE
 Encryption succeeded, but done in software instead of the requested hardware.
-.It Bq Er DESERR_HWERR
+.It Bq Er DESERR_HWERROR
 An error occurred in the hardware or driver.
 .It Bq Er DESERR_BADPARAM
 Bad argument to routine.

Modified: user/markj/netdump/lib/libc/softfloat/Symbol.map
==============================================================================
--- user/markj/netdump/lib/libc/softfloat/Symbol.map	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libc/softfloat/Symbol.map	Fri Mar  9 22:52:52 2018	(r330707)
@@ -22,8 +22,17 @@ FBSDprivate_1.0 {
 	__softfloat_float_exception_mask;
 	__softfloat_float_rounding_mode;
 	__softfloat_float_raise;
+	__adddf3;
+	__addsf3;
+	__divdf3;
+	__divsf3;
 	__eqdf2;
 	__eqsf2;
+	__extendsfdf2;
+	__fixdfsi;
+	__fixsfsi;
+	__floatsidf;
+	__floatsisf;
 	__gedf2;
 	__gesf2;
 	__gtdf2;
@@ -32,10 +41,15 @@ FBSDprivate_1.0 {
 	__lesf2;
 	__ltdf2;
 	__ltsf2;
+	__muldf3;
+	__mulsf3;
 	__nedf2;
 	__negdf2;
 	__negsf2;
 	__nesf2;
+	__subdf3;
+	__subsf3;
+	__truncdfsf2;
 	__unorddf2;
 	__unordsf2;
 };

Modified: user/markj/netdump/lib/libmagic/Makefile
==============================================================================
--- user/markj/netdump/lib/libmagic/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/lib/libmagic/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -8,7 +8,9 @@ CONTRDIR=	${SRCTOP}/contrib/file
 
 LIB=	magic
 SHLIB_MAJOR=	4
+.if !make(build-tools)
 LIBADD=	z
+.endif
 MAN=	libmagic.3 magic.5
 
 SRCS=	apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \

Modified: user/markj/netdump/libexec/rpc.sprayd/Makefile
==============================================================================
--- user/markj/netdump/libexec/rpc.sprayd/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/libexec/rpc.sprayd/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -6,6 +6,4 @@ MAN =	rpc.sprayd.8
 
 LIBADD=	rpcsvc
 
-WARNS?=	2
-
 .include <bsd.prog.mk>

Modified: user/markj/netdump/libexec/rpc.sprayd/sprayd.c
==============================================================================
--- user/markj/netdump/libexec/rpc.sprayd/sprayd.c	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/libexec/rpc.sprayd/sprayd.c	Fri Mar  9 22:52:52 2018	(r330707)
@@ -58,21 +58,21 @@ static int from_inetd = 1;
 
 #define TIMEOUT 120
 
-void
+static void
 cleanup(int sig __unused)
 {
 	(void)rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
 	exit(0);
 }
 
-void
+static void
 die(int sig __unused)
 {
 	exit(0);
 }
 
 int
-main(int argc, char *argv[])
+main(int argc __unused, char *argv[] __unused)
 {
 	SVCXPRT *transp;
 	int ok;

Modified: user/markj/netdump/libexec/tftpd/Makefile
==============================================================================
--- user/markj/netdump/libexec/tftpd/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/libexec/tftpd/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -14,4 +14,7 @@ CFLAGS+=	-DLIBWRAP
 LIBADD=	wrap
 .endif
 
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+= tests
+
 .include <bsd.prog.mk>

Modified: user/markj/netdump/sbin/ipfw/tables.c
==============================================================================
--- user/markj/netdump/sbin/ipfw/tables.c	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/sbin/ipfw/tables.c	Fri Mar  9 22:52:52 2018	(r330707)
@@ -1471,6 +1471,7 @@ tentry_fill_value(ipfw_obj_header *oh, ipfw_obj_tentry
 	uint32_t i;
 	int dval;
 	char *comma, *e, *etype, *n, *p;
+	struct in_addr ipaddr;
 
 	v = &tent->v.value;
 
@@ -1487,8 +1488,8 @@ tentry_fill_value(ipfw_obj_header *oh, ipfw_obj_tentry
 			return;
 		}
 		/* Try hostname */
-		if (lookup_host(arg, (struct in_addr *)&val) == 0) {
-			set_legacy_value(val, v);
+		if (lookup_host(arg, &ipaddr) == 0) {
+			set_legacy_value(ntohl(ipaddr.s_addr), v);
 			return;
 		}
 		errx(EX_OSERR, "Unable to parse value %s", arg);
@@ -1557,8 +1558,10 @@ tentry_fill_value(ipfw_obj_header *oh, ipfw_obj_tentry
 				v->nh4 = ntohl(a4);
 				break;
 			}
-			if (lookup_host(n, (struct in_addr *)&v->nh4) == 0)
+			if (lookup_host(n, &ipaddr) == 0) {
+				v->nh4 = ntohl(ipaddr.s_addr);
 				break;
+			}
 			etype = "ipv4";
 			break;
 		case IPFW_VTYPE_DSCP:

Modified: user/markj/netdump/sbin/mount/mount.c
==============================================================================
--- user/markj/netdump/sbin/mount/mount.c	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/sbin/mount/mount.c	Fri Mar  9 22:52:52 2018	(r330707)
@@ -589,11 +589,8 @@ mountfs(const char *vfstype, const char *spec, const c
 		optbuf = catopt(optbuf, "update");
 
 	/* Compatibility glue. */
-	if (strcmp(vfstype, "msdos") == 0) {
-		warnx(
-		    "Using \"-t msdosfs\", since \"-t msdos\" is deprecated.");
+	if (strcmp(vfstype, "msdos") == 0)
 		vfstype = "msdosfs";
-	}
 
 	/* Construct the name of the appropriate mount command */
 	(void)snprintf(execname, sizeof(execname), "mount_%s", vfstype);

Modified: user/markj/netdump/share/dtrace/Makefile
==============================================================================
--- user/markj/netdump/share/dtrace/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/dtrace/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -17,10 +17,7 @@ SCRIPTS=	blocking \
 		tcpdebug \
 		tcpstate \
 		tcptrack \
-		udptrack \
-		watch_execve \
-		watch_kill \
-		watch_vop_remove
+		udptrack
 
 SCRIPTSDIR= ${SHAREDIR}/dtrace
 

Modified: user/markj/netdump/share/man/man4/Makefile
==============================================================================
--- user/markj/netdump/share/man/man4/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man4/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -929,6 +929,10 @@ MAN+=		mlx4ib.4
 MAN+=		mlx5ib.4
 .endif
 
+.if ${MK_MLX5TOOL} != "no"
+MAN+=		mlx5io.4
+.endif
+
 .if ${MK_TESTS} != "no"
 ATF=            ${SRCTOP}/contrib/atf
 .PATH:          ${ATF}/doc

Copied: user/markj/netdump/share/man/man4/mlx5io.4 (from r330706, head/share/man/man4/mlx5io.4)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/markj/netdump/share/man/man4/mlx5io.4	Fri Mar  9 22:52:52 2018	(r330707, copy of r330706, head/share/man/man4/mlx5io.4)
@@ -0,0 +1,142 @@
+.\"
+.\" Copyright (c) 2018 Mellanox Technologies
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd February 20, 2018
+.Dt mlx5io 4
+.Os
+.Sh NAME
+.Nm mlx5io
+.Nd IOCTL interface to manage Connect-X 4/5 Mellanox network adapters
+.Sh SYNOPSIS
+.In dev/mlx5/mlx5io.h
+.Sh DESCRIPTION
+The
+.Nm
+interface is provided for management of the Connect-X 4 and 5 network adapters
+in the aspects not covered by the generic network configuration,
+mostly related to the PCIe attachment and internal card working.
+Interface consists of the commands, which are passed by means of
+.Xr ioctl 2
+on the file descriptor, opened from the
+.Pa /dev/mlx5ctl
+device node.
+.Pp
+The following commands are implemented:
+.Bl -tag -width indent
+.It Dv MLX5_FWDUMP_FORCE
+Take the snapshot of the firmware registers state and store it in the
+kernel buffer.
+The buffer must be empty, in other words, no dumps should be written so
+far, or existing dump cleared with the
+.Dv MLX5_FWDUMP_RESET
+command for the specified device.
+The argument for the command should point to the
+.Vt struct mlx5_fwdump_addr
+structure, containing the PCIe bus address of the device.
+.Bd -literal
+struct mlx5_fwdump_addr {
+	uint32_t domain;
+	uint8_t bus;
+	uint8_t slot;
+	uint8_t func;
+};
+.Ed
+.It Dv MLX5_FWDUMP_RESET
+Clear the stored firmware dump, preparing the kernel buffer for
+the next dump.
+The argument for the command should point to the
+.Vt struct mlx5_fwdump_addr
+structure, containing the PCIe bus address of the device.
+.It Dv MLX5_FWDUMP_GET
+Fetch the stored firmware dump into the user memory.
+The argument to the command should point to the input/output
+.Vt struct mlx5_fwdump_get
+structure.
+Its
+.Dv devaddr
+field specifies the address of the device, the
+.Dv buf
+fields points to the array of
+.Vt struct mlx5_fwdump_reg
+of records of the registers values, the size of the array is specified
+in the
+.Dv reg_cnt
+field.
+.Bd -literal
+struct mlx5_fwdump_get {
+	struct mlx5_fwdump_addr devaddr;
+	struct mlx5_fwdump_reg *buf;
+	size_t reg_cnt;
+	size_t reg_filled; /* out */
+};
+.Ed
+.Pp
+On successfull return, the
+.Dv reg_filled
+field reports the number of the
+.Dv buf
+array elements actually filled with the registers values.
+If
+.Dv buf
+contains the
+.Dv NULL
+pointer, no registers are filled, but
+.Dv reg_filled
+still contains the number of registers that should be passed for
+the complete dump.
+.Pp
+The
+.Vt struct mlx5_fwdump_reg
+element contains the address of the register in the field
+.Dv addr ,
+and its value in the field
+.Dv val .
+.Bd -literal
+struct mlx5_fwdump_reg {
+	uint32_t addr;
+	uint32_t val;
+};
+.Ed
+.El
+.Sh FILES
+The
+.Pa /dev/mlx5ctl
+.Xr devfs 5
+node is used to pass commands to the driver.
+.Sh RETURN VALUES
+If successful, the IOCTL returns zero.
+Otherwise, -1 is returned and the global variable
+.Va errno
+is set to indicate the error.
+.Sh SEE ALSO
+.Xr errno 2 ,
+.Xr ioctl 2 ,
+.Xr mlx5en 4 ,
+.Xr mlx5ib 4 ,
+.Xr mlx5tool 8
+and
+.Xr pci 9 .

Modified: user/markj/netdump/share/man/man4/psm.4
==============================================================================
--- user/markj/netdump/share/man/man4/psm.4	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man4/psm.4	Fri Mar  9 22:52:52 2018	(r330707)
@@ -868,11 +868,6 @@ unless the X server is accessing the mouse via
 .Xr moused 8 .
 Clicking any button without moving the mouse may also work.
 .Sh BUGS
-The ioctl command
-.Dv MOUSEIOCREAD
-has been removed.
-It was never functional anyway.
-.Pp
 Enabling the extended support for Synaptics touchpads has been reported to
 cause problems with responsivity on some (newer) models of Synaptics
 hardware, particularly those with guest devices.

Modified: user/markj/netdump/share/man/man5/periodic.conf.5
==============================================================================
--- user/markj/netdump/share/man/man5/periodic.conf.5	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man5/periodic.conf.5	Fri Mar  9 22:52:52 2018	(r330707)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 31, 2017
+.Dd March 7, 2018
 .Dt PERIODIC.CONF 5
 .Os
 .Sh NAME
@@ -433,7 +433,7 @@ if you want to run
 without the
 .Fl n
 option (to do DNS lookups).
-.It Va daily_status_rwho_enable
+.It Va daily_status_uptime_enable
 .Pq Vt bool
 Set to
 .Dq Li YES

Modified: user/markj/netdump/share/man/man5/src.conf.5
==============================================================================
--- user/markj/netdump/share/man/man5/src.conf.5	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man5/src.conf.5	Fri Mar  9 22:52:52 2018	(r330707)
@@ -1,6 +1,6 @@
 .\" DO NOT EDIT-- this file is generated by tools/build/options/makeman.
 .\" $FreeBSD$
-.Dd March 1, 2018
+.Dd March 7, 2018
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -397,6 +397,8 @@ When set, it enforces these options:
 .Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP
 .It
 .Va WITHOUT_GCC_BOOTSTRAP
+.It
+.Va WITHOUT_LLD_BOOTSTRAP
 .El
 .It Va WITHOUT_CRYPT
 Set to not build any crypto code.
@@ -434,12 +436,18 @@ Set to not build CUSE-related programs and libraries.
 .It Va WITHOUT_CXGBETOOL
 Set to not build
 .Xr cxgbetool 8
+.It Va WITHOUT_MLX5TOOL
+Set to not build
+.Xr mlx5tool 8
 .Pp
 This is a default setting on
 arm/arm, arm/armeb, arm/armv6, arm/armv7, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, mips/mipselhf, mips/mipshf, mips/mips64elhf, mips/mips64hf, powerpc/powerpc, powerpc/powerpcspe, riscv/riscv64 and riscv/riscv64sf.
 .It Va WITH_CXGBETOOL
 Set to build
 .Xr cxgbetool 8
+.It Va WITH_MLX5TOOL
+Set to build
+.Xr mlx5tool 8
 .Pp
 This is a default setting on
 amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc64 and sparc64/sparc64.

Modified: user/markj/netdump/share/man/man8/diskless.8
==============================================================================
--- user/markj/netdump/share/man/man8/diskless.8	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man8/diskless.8	Fri Mar  9 22:52:52 2018	(r330707)
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 7, 2011
+.Dd March 6, 2018
 .Dt DISKLESS 8
 .Os
 .Sh NAME
@@ -311,7 +311,7 @@ The
 .Nm
 scripts create memory file systems to hold the overridden
 directories.
-Only a 2MB partition is created by default, which may not
+Only a 5MB partition is created by default, which may not
 be sufficient for your purposes.
 To override this, you can create the
 file

Modified: user/markj/netdump/share/man/man9/fpu_kern.9
==============================================================================
--- user/markj/netdump/share/man/man9/fpu_kern.9	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man9/fpu_kern.9	Fri Mar  9 22:52:52 2018	(r330707)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2016
+.Dd March 7, 2018
 .Dt FPU_KERN 9
 .Os
 .Sh NAME
@@ -34,7 +34,7 @@
 .Fn fpu_kern_alloc_ctx "u_int flags"
 .Ft void
 .Fn fpu_kern_free_ctx "struct fpu_kern_ctx *ctx"
-.Ft int
+.Ft void
 .Fn fpu_kern_enter "struct thread *td" "struct fpu_kern_ctx *ctx" "u_int flags"
 .Ft int
 .Fn fpu_kern_leave "struct thread *td" "struct fpu_kern_ctx *ctx"
@@ -139,19 +139,15 @@ after the function returns, as well as after each cont
 On i386 and amd64 this will be the
 .Nm Device Not Available
 exception (see Intel Software Developer Manual for the reference).
-Currently, no errors are defined which can be returned by
-.Fn fpu_kern_enter
-to the caller.
 .Pp
 The
 .Fn fpu_kern_leave
 function ends the region started by
 .Fn fpu_kern_enter .
-The uses of FPU in the kernel after the call to
-.Fn fpu_kern_leave
-are erroneous until the next call to
+It is erroneous to use the FPU in the kernel before
 .Fn fpu_kern_enter
-is performed.
+or after
+.Fn fpu_kern_leave .
 The function takes the
 .Fa td
 thread argument, which currently must be
@@ -161,9 +157,9 @@ and the
 context pointer, previously passed to
 .Fn fpu_kern_enter .
 After the function returns, the context may be freed or reused
-by other invocation of
+by another invocation of
 .Fn fpu_kern_enter .
-There are no errors defined for the function, it always returns 0.
+The function always returns 0.
 .Pp
 The
 .Fn fpu_kern_thread
@@ -210,3 +206,9 @@ facitily and this manual page were written by
 .An Konstantin Belousov Aq Mt kib@FreeBSD.org .
 The arm64 support was added by
 .An Andrew Turner Aq Mt andrew@FreeBSD.org .
+.Sh BUGS
+.Fn fpu_kern_leave
+should probably have type
+.Ft void
+(like
+.Fn fpu_kern_enter ) .

Modified: user/markj/netdump/share/man/man9/g_bio.9
==============================================================================
--- user/markj/netdump/share/man/man9/g_bio.9	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man9/g_bio.9	Fri Mar  9 22:52:52 2018	(r330707)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 17, 2016
+.Dd Mar 7, 2018
 .Dt G_BIO 9
 .Os
 .Sh NAME
@@ -59,7 +59,7 @@ most important fields are described below:
 .Bl -tag -width ".Va bio_attribute"
 .It Va bio_cmd
 I/O request command.
-There are four I/O requests available in GEOM:
+There are five I/O requests available in GEOM:
 .Bl -tag -width ".Dv BIO_GETATTR"
 .It Dv BIO_READ
 A read request.

Modified: user/markj/netdump/share/man/man9/style.9
==============================================================================
--- user/markj/netdump/share/man/man9/style.9	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/man/man9/style.9	Fri Mar  9 22:52:52 2018	(r330707)
@@ -763,17 +763,9 @@ do not roll your own.
 }
 .Ed
 .Pp
-Old-style function declarations look like this:
-.Bd -literal
-static char *
-function(a1, a2, fl, a4)
-	int a1, a2;	/* Declare ints, too, do not default them. */
-	float fl;	/* Beware double vs. float prototype differences. */
-	int a4;		/* List in order declared. */
-{
-.Ed
+When converting K&R style declarations to ANSI style, preserve
+any comments about parameters.
 .Pp
-Use ANSI function declarations unless you explicitly need K&R compatibility.
 Long parameter lists are wrapped with a normal four space indent.
 .Pp
 Variable numbers of arguments should look like this:

Modified: user/markj/netdump/share/misc/committers-src.dot
==============================================================================
--- user/markj/netdump/share/misc/committers-src.dot	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/misc/committers-src.dot	Fri Mar  9 22:52:52 2018	(r330707)
@@ -187,6 +187,7 @@ gshapiro [label="Gregory Shapiro\ngshapiro@FreeBSD.org
 harti [label="Hartmut Brandt\nharti@FreeBSD.org\n2003/01/29"]
 hiren [label="Hiren Panchasara\nhiren@FreeBSD.org\n2013/04/12"]
 hmp [label="Hiten Pandya\nhmp@FreeBSD.org\n2004/03/23"]
+hselasky [label="Hans Petter Selasky\nhselasky@FreeBSD.org\n"]
 ian [label="Ian Lepore\nian@FreeBSD.org\n2013/01/07"]
 iedowse [label="Ian Dowse\niedowse@FreeBSD.org\n2000/12/01"]
 imp [label="Warner Losh\nimp@FreeBSD.org\n1996/09/20"]
@@ -313,6 +314,7 @@ shurd [label="Stephen Hurd\nshurd@FreeBSD.org\n2017/09
 simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"]
 sjg [label="Simon J. Gerraty\nsjg@FreeBSD.org\n2012/10/23"]
 skra [label="Svatopluk Kraus\nskra@FreeBSD.org\n2015/10/28"]
+slavash [label="Slava Shwartsman\nslavash@FreeBSD.org\n2018/02/08"]
 slm [label="Stephen McConnell\nslm@FreeBSD.org\n2014/05/07"]
 smh [label="Steven Hartland\nsmh@FreeBSD.org\n2012/11/12"]
 sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2001/07/25"]
@@ -524,6 +526,8 @@ grog -> edwin
 grog -> le
 grog -> peterj
 
+hselasky -> slavash
+
 imp -> akiyama
 imp -> ambrisko
 imp -> andrew
@@ -640,6 +644,7 @@ kib -> rdivacky
 kib -> rmacklem
 kib -> rmh
 kib -> skra
+kib -> slavash
 kib -> stas
 kib -> tijl
 kib -> trociny

Modified: user/markj/netdump/share/mk/src.opts.mk
==============================================================================
--- user/markj/netdump/share/mk/src.opts.mk	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/share/mk/src.opts.mk	Fri Mar  9 22:52:52 2018	(r330707)
@@ -320,8 +320,10 @@ BROKEN_OPTIONS+=PROFILE
 .if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
     ${__T} == "powerpc64" || ${__T} == "sparc64"
 __DEFAULT_YES_OPTIONS+=CXGBETOOL
+__DEFAULT_YES_OPTIONS+=MLX5TOOL
 .else
 __DEFAULT_NO_OPTIONS+=CXGBETOOL
+__DEFAULT_NO_OPTIONS+=MLX5TOOL
 .endif
 
 .include <bsd.mkopt.mk>
@@ -437,6 +439,7 @@ MK_BINUTILS_BOOTSTRAP:= no
 MK_CLANG_BOOTSTRAP:= no
 MK_ELFTOOLCHAIN_BOOTSTRAP:= no
 MK_GCC_BOOTSTRAP:= no
+MK_LLD_BOOTSTRAP:= no
 .endif
 
 .if ${MK_TOOLCHAIN} == "no"

Modified: user/markj/netdump/stand/defaults/loader.conf.5
==============================================================================
--- user/markj/netdump/stand/defaults/loader.conf.5	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/stand/defaults/loader.conf.5	Fri Mar  9 22:52:52 2018	(r330707)
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd January 6, 2016
+.Dd March 7, 2018
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -277,6 +277,23 @@ See the entropy entries in
 .Pq Dq /boot/entropy
 The name of the very early
 boot-time entropy cache file.
+.El
+.Sh OTHER SETTINGS
+Other settings that may be used in
+.Nm
+that have no default value:
+.Bl -tag -width bootfile -offset indent
+.It Va fdt_overlays
+Specifies a comma-delimited list of FDT overlays to apply.
+.Pa /boot/overlays
+is created by default for overlays to be placed in.
+.It Va kernels_autodetect
+If set to
+.Dq YES ,
+attempt to auto-detect kernels installed in
+.Pa /boot .
+This is an option specific to the Lua-based loader.
+It is not available in the default Forth-based loader.
 .El
 .Sh FILES
 .Bl -tag -width /boot/defaults/loader.conf -compact

Modified: user/markj/netdump/stand/ficl/Makefile
==============================================================================
--- user/markj/netdump/stand/ficl/Makefile	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/stand/ficl/Makefile	Fri Mar  9 22:52:52 2018	(r330707)
@@ -13,7 +13,8 @@ SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES+=	softcore.c testmain testmain.o
 
 .ifmake testmain
-CFLAGS+=	-DTESTMAIN -D_TESTMAIN
+CFLAGS=	-DTESTMAIN -D_TESTMAIN
+CFLAGS+=	-I${FICLSRC} -I${FICLSRC}/${FICL_CPUARCH} -I${LDRSRC}
 SRCS+=		testmain.c
 PROG=		testmain
 .include <bsd.prog.mk>

Modified: user/markj/netdump/stand/liblua/lutils.c
==============================================================================
--- user/markj/netdump/stand/liblua/lutils.c	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/stand/liblua/lutils.c	Fri Mar  9 22:52:52 2018	(r330707)
@@ -97,6 +97,24 @@ lua_interpret(lua_State *L)
 }
 
 static int
+lua_parse(lua_State *L)
+{
+	int	argc, nargc;
+	char	**argv;
+
+	if (parse(&argc, &argv, luaL_checkstring(L, 1)) == 0) {
+		for (nargc = 0; nargc < argc; ++nargc) {
+			lua_pushstring(L, argv[nargc]);
+		}
+		free(argv);
+		return nargc;
+	}
+
+	lua_pushnil(L);
+	return 1;
+}
+
+static int
 lua_getchar(lua_State *L)
 {
 
@@ -325,6 +343,7 @@ static const struct luaL_Reg loaderlib[] = {
 	REG_SIMPLE(delay),
 	REG_SIMPLE(command),
 	REG_SIMPLE(interpret),
+	REG_SIMPLE(parse),
 	REG_SIMPLE(getenv),
 	REG_SIMPLE(perform),
 	/* Also registered as the global 'printc' */

Modified: user/markj/netdump/stand/loader.mk
==============================================================================
--- user/markj/netdump/stand/loader.mk	Fri Mar  9 22:34:43 2018	(r330706)
+++ user/markj/netdump/stand/loader.mk	Fri Mar  9 22:52:52 2018	(r330707)

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