From owner-svn-src-projects@freebsd.org  Tue Dec 22 13:58:16 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4C84FA4D602
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 22 Dec 2015 13:58:16 +0000 (UTC) (envelope-from bz@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 mx1.freebsd.org (Postfix) with ESMTPS id BC1201B7B;
 Tue, 22 Dec 2015 13:58:15 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMDwEuN024433;
 Tue, 22 Dec 2015 13:58:14 GMT (envelope-from bz@FreeBSD.org)
Received: (from bz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMDwCmF024409;
 Tue, 22 Dec 2015 13:58:12 GMT (envelope-from bz@FreeBSD.org)
Message-Id: <201512221358.tBMDwCmF024409@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bz set sender to bz@FreeBSD.org
 using -f
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 22 Dec 2015 13:58:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292600 - in projects/vnet: . bin/ed bin/freebsd-version
 bin/ls bin/ls/tests bin/sh bin/sh/tests/parameters
 cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa
 cddl/contrib/opens...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2015 13:58:16 -0000

Author: bz
Date: Tue Dec 22 13:58:11 2015
New Revision: 292600
URL: https://svnweb.freebsd.org/changeset/base/292600

Log:
  MFH @r292599
  
  This includes the pluggable TCP framework and other chnages to the
  netstack to track for VNET stability.
  
  Security:	The FreeBSD Foundation

Added:
  projects/vnet/bin/sh/tests/parameters/positional9.0
     - copied unchanged from r292599, head/bin/sh/tests/parameters/positional9.0
  projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
     - copied unchanged from r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
  projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
     - copied unchanged from r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
  projects/vnet/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff
     - copied unchanged from r292599, head/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff
  projects/vnet/contrib/openbsm/.travis.yml
     - copied unchanged from r292599, head/contrib/openbsm/.travis.yml
  projects/vnet/contrib/openbsm/libbsm/au_notify.3
     - copied unchanged from r292599, head/contrib/openbsm/libbsm/au_notify.3
  projects/vnet/contrib/unbound/.gitignore
     - copied unchanged from r292599, head/contrib/unbound/.gitignore
  projects/vnet/contrib/unbound/compat/isblank.c
     - copied unchanged from r292599, head/contrib/unbound/compat/isblank.c
  projects/vnet/etc/etc.riscv/
     - copied from r292599, head/etc/etc.riscv/
  projects/vnet/lib/csu/riscv/
     - copied from r292599, head/lib/csu/riscv/
  projects/vnet/lib/libc/aarch64/sys/__vdso_gettc.c
     - copied unchanged from r292599, head/lib/libc/aarch64/sys/__vdso_gettc.c
  projects/vnet/lib/libc/arm/sys/__vdso_gettc.c
     - copied unchanged from r292599, head/lib/libc/arm/sys/__vdso_gettc.c
  projects/vnet/lib/libc/riscv/
     - copied from r292599, head/lib/libc/riscv/
  projects/vnet/lib/libc/tests/nss/
     - copied from r292599, head/lib/libc/tests/nss/
  projects/vnet/lib/libc/tests/resolv/
     - copied from r292599, head/lib/libc/tests/resolv/
  projects/vnet/lib/libstand/uuid_from_string.c
     - copied unchanged from r292599, head/lib/libstand/uuid_from_string.c
  projects/vnet/lib/libstand/uuid_to_string.c
     - copied unchanged from r292599, head/lib/libstand/uuid_to_string.c
  projects/vnet/lib/libsysdecode/
     - copied from r292599, head/lib/libsysdecode/
  projects/vnet/lib/libthr/arch/riscv/
     - copied from r292599, head/lib/libthr/arch/riscv/
  projects/vnet/lib/msun/riscv/
     - copied from r292599, head/lib/msun/riscv/
  projects/vnet/lib/msun/tests/cexp_test.c
     - copied unchanged from r292599, head/lib/msun/tests/cexp_test.c
  projects/vnet/lib/msun/tests/conj_test.c
     - copied unchanged from r292599, head/lib/msun/tests/conj_test.c
  projects/vnet/lib/msun/tests/csqrt_test.c
     - copied unchanged from r292599, head/lib/msun/tests/csqrt_test.c
  projects/vnet/lib/msun/tests/ctrig_test.c
     - copied unchanged from r292599, head/lib/msun/tests/ctrig_test.c
  projects/vnet/lib/msun/tests/exponential_test.c
     - copied unchanged from r292599, head/lib/msun/tests/exponential_test.c
  projects/vnet/lib/msun/tests/fenv_test.c
     - copied unchanged from r292599, head/lib/msun/tests/fenv_test.c
  projects/vnet/lib/msun/tests/fma_test.c
     - copied unchanged from r292599, head/lib/msun/tests/fma_test.c
  projects/vnet/lib/msun/tests/fmaxmin_test.c
     - copied unchanged from r292599, head/lib/msun/tests/fmaxmin_test.c
  projects/vnet/lib/msun/tests/ilogb_test.c
     - copied unchanged from r292599, head/lib/msun/tests/ilogb_test.c
  projects/vnet/lib/msun/tests/invctrig_test.c
     - copied unchanged from r292599, head/lib/msun/tests/invctrig_test.c
  projects/vnet/lib/msun/tests/invtrig_test.c
     - copied unchanged from r292599, head/lib/msun/tests/invtrig_test.c
  projects/vnet/lib/msun/tests/logarithm_test.c
     - copied unchanged from r292599, head/lib/msun/tests/logarithm_test.c
  projects/vnet/lib/msun/tests/lrint_test.c
     - copied unchanged from r292599, head/lib/msun/tests/lrint_test.c
  projects/vnet/lib/msun/tests/lround_test.c
     - copied unchanged from r292599, head/lib/msun/tests/lround_test.c
  projects/vnet/lib/msun/tests/lround_test.t
     - copied unchanged from r292599, head/lib/msun/tests/lround_test.t
  projects/vnet/lib/msun/tests/nan_test.c
     - copied unchanged from r292599, head/lib/msun/tests/nan_test.c
  projects/vnet/lib/msun/tests/nearbyint_test.c
     - copied unchanged from r292599, head/lib/msun/tests/nearbyint_test.c
  projects/vnet/lib/msun/tests/next_test.c
     - copied unchanged from r292599, head/lib/msun/tests/next_test.c
  projects/vnet/lib/msun/tests/rem_test.c
     - copied unchanged from r292599, head/lib/msun/tests/rem_test.c
  projects/vnet/lib/msun/tests/test-utils.h
     - copied unchanged from r292599, head/lib/msun/tests/test-utils.h
  projects/vnet/lib/msun/tests/trig_test.c
     - copied unchanged from r292599, head/lib/msun/tests/trig_test.c
  projects/vnet/share/man/man9/proc_rwmem.9
     - copied unchanged from r292599, head/share/man/man9/proc_rwmem.9
  projects/vnet/sys/arm/arm/machdep_intr.c
     - copied unchanged from r292599, head/sys/arm/arm/machdep_intr.c
  projects/vnet/sys/arm/arm/ofw_machdep.c
     - copied unchanged from r292599, head/sys/arm/arm/ofw_machdep.c
  projects/vnet/sys/arm/freescale/imx/imx6_hdmi.c
     - copied unchanged from r292599, head/sys/arm/freescale/imx/imx6_hdmi.c
  projects/vnet/sys/arm/freescale/imx/imx6_hdmireg.h
     - copied unchanged from r292599, head/sys/arm/freescale/imx/imx6_hdmireg.h
  projects/vnet/sys/arm/freescale/imx/imx6_ipu.c
     - copied unchanged from r292599, head/sys/arm/freescale/imx/imx6_ipu.c
  projects/vnet/sys/arm/freescale/imx/imx_iomuxreg.h
     - copied unchanged from r292599, head/sys/arm/freescale/imx/imx_iomuxreg.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/srcu.h
     - copied unchanged from r292599, head/sys/compat/linuxkpi/common/include/linux/srcu.h
  projects/vnet/sys/dev/mlx5/eswitch_vacl.h
     - copied unchanged from r292599, head/sys/dev/mlx5/eswitch_vacl.h
  projects/vnet/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
     - copied unchanged from r292599, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
  projects/vnet/sys/dev/ofw/ofw_subr.c
     - copied unchanged from r292599, head/sys/dev/ofw/ofw_subr.c
  projects/vnet/sys/dev/ofw/ofw_subr.h
     - copied unchanged from r292599, head/sys/dev/ofw/ofw_subr.h
  projects/vnet/sys/geom/sched/gs_delay.c
     - copied unchanged from r292599, head/sys/geom/sched/gs_delay.c
  projects/vnet/sys/kern/pic_if.m
     - copied unchanged from r292599, head/sys/kern/pic_if.m
  projects/vnet/sys/kern/subr_intr.c
     - copied unchanged from r292599, head/sys/kern/subr_intr.c
  projects/vnet/sys/mips/mips/ofw_machdep.c
     - copied unchanged from r292599, head/sys/mips/mips/ofw_machdep.c
  projects/vnet/sys/modules/geom/geom_sched/gsched_delay/
     - copied from r292599, head/sys/modules/geom/geom_sched/gsched_delay/
  projects/vnet/sys/modules/tcp/
     - copied from r292599, head/sys/modules/tcp/
  projects/vnet/sys/netinet/in_fib.c
     - copied unchanged from r292599, head/sys/netinet/in_fib.c
  projects/vnet/sys/netinet/in_fib.h
     - copied unchanged from r292599, head/sys/netinet/in_fib.h
  projects/vnet/sys/netinet/tcp_stacks/
     - copied from r292599, head/sys/netinet/tcp_stacks/
  projects/vnet/sys/netinet6/in6_fib.c
     - copied unchanged from r292599, head/sys/netinet6/in6_fib.c
  projects/vnet/sys/netinet6/in6_fib.h
     - copied unchanged from r292599, head/sys/netinet6/in6_fib.h
  projects/vnet/sys/riscv/
     - copied from r292599, head/sys/riscv/
  projects/vnet/sys/x86/include/x86_smp.h
     - copied unchanged from r292599, head/sys/x86/include/x86_smp.h
  projects/vnet/sys/x86/include/x86_var.h
     - copied unchanged from r292599, head/sys/x86/include/x86_var.h
  projects/vnet/tests/sys/mac/
     - copied from r292599, head/tests/sys/mac/
  projects/vnet/tools/tools/nanobsd/embedded/
     - copied from r292599, head/tools/tools/nanobsd/embedded/
  projects/vnet/tools/tools/nanobsd/mtree-dedup.awk
     - copied unchanged from r292599, head/tools/tools/nanobsd/mtree-dedup.awk
Deleted:
  projects/vnet/sys/arm/arm/intrng.c
  projects/vnet/sys/arm/arm/pic_if.m
  projects/vnet/sys/arm/include/katelib.h
  projects/vnet/tools/regression/lib/libc/nss/
  projects/vnet/tools/regression/lib/libc/resolv/
  projects/vnet/tools/regression/lib/msun/
  projects/vnet/tools/regression/mac/
  projects/vnet/usr.bin/kdump/utrace.c
Modified:
  projects/vnet/MAINTAINERS   (contents, props changed)
  projects/vnet/Makefile
  projects/vnet/Makefile.inc1
  projects/vnet/UPDATING
  projects/vnet/bin/ed/main.c
  projects/vnet/bin/freebsd-version/Makefile
  projects/vnet/bin/ls/print.c
  projects/vnet/bin/ls/tests/ls_tests.sh
  projects/vnet/bin/sh/mknodes.c
  projects/vnet/bin/sh/tests/parameters/Makefile
  projects/vnet/bin/sh/var.c
  projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
  projects/vnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/vnet/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
  projects/vnet/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
  projects/vnet/contrib/bmake/ChangeLog
  projects/vnet/contrib/bmake/Makefile
  projects/vnet/contrib/bmake/boot-strap
  projects/vnet/contrib/bmake/cond.c
  projects/vnet/contrib/bmake/config.h.in
  projects/vnet/contrib/bmake/configure
  projects/vnet/contrib/bmake/configure.in
  projects/vnet/contrib/bmake/main.c
  projects/vnet/contrib/bmake/meta.c
  projects/vnet/contrib/bmake/mk/ChangeLog
  projects/vnet/contrib/bmake/mk/host-target.mk
  projects/vnet/contrib/bmake/mk/init.mk
  projects/vnet/contrib/bmake/mk/install-mk
  projects/vnet/contrib/bmake/mk/lib.mk
  projects/vnet/contrib/bmake/mk/meta.autodep.mk
  projects/vnet/contrib/bmake/mk/meta.stage.mk
  projects/vnet/contrib/bmake/mk/meta.subdir.mk
  projects/vnet/contrib/bmake/mk/meta.sys.mk
  projects/vnet/contrib/bmake/mk/own.mk
  projects/vnet/contrib/bmake/mk/sys.mk
  projects/vnet/contrib/bmake/os.sh
  projects/vnet/contrib/bmake/parse.c
  projects/vnet/contrib/bmake/unit-tests/Makefile.in
  projects/vnet/contrib/bmake/unit-tests/cond2.mk
  projects/vnet/contrib/bmake/unit-tests/doterror.exp
  projects/vnet/contrib/bmake/unit-tests/modts.mk
  projects/vnet/contrib/bmake/var.c
  projects/vnet/contrib/elftoolchain/addr2line/addr2line.1
  projects/vnet/contrib/elftoolchain/addr2line/addr2line.c
  projects/vnet/contrib/elftoolchain/common/elfdefinitions.h
  projects/vnet/contrib/elftoolchain/elfcopy/binary.c
  projects/vnet/contrib/elftoolchain/elfcopy/elfcopy.1
  projects/vnet/contrib/elftoolchain/elfcopy/main.c
  projects/vnet/contrib/elftoolchain/elfcopy/sections.c
  projects/vnet/contrib/elftoolchain/elfcopy/segments.c
  projects/vnet/contrib/elftoolchain/libelf/elf_data.c
  projects/vnet/contrib/elftoolchain/readelf/readelf.c
  projects/vnet/contrib/llvm/tools/lldb/docs/lldb.1
  projects/vnet/contrib/mdocml/lib.in
  projects/vnet/contrib/netbsd-tests/lib/libc/gen/t_assert.c
  projects/vnet/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
  projects/vnet/contrib/netbsd-tests/usr.bin/grep/d_binary.out
  projects/vnet/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/vnet/contrib/ofed/usr.bin/ibaddr/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibnetdiscover/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibping/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibportstate/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibroute/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibsendtrap/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibstat/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibsysstat/Makefile
  projects/vnet/contrib/ofed/usr.bin/ibtracert/Makefile
  projects/vnet/contrib/ofed/usr.bin/opensm/Makefile
  projects/vnet/contrib/ofed/usr.bin/osmtest/Makefile
  projects/vnet/contrib/ofed/usr.bin/perfquery/Makefile
  projects/vnet/contrib/ofed/usr.bin/saquery/Makefile
  projects/vnet/contrib/ofed/usr.bin/sminfo/Makefile
  projects/vnet/contrib/ofed/usr.bin/smpdump/Makefile
  projects/vnet/contrib/ofed/usr.bin/smpquery/Makefile
  projects/vnet/contrib/ofed/usr.bin/vendstat/Makefile
  projects/vnet/contrib/openbsm/INSTALL
  projects/vnet/contrib/openbsm/LICENSE
  projects/vnet/contrib/openbsm/Makefile.am
  projects/vnet/contrib/openbsm/Makefile.in
  projects/vnet/contrib/openbsm/NEWS
  projects/vnet/contrib/openbsm/README
  projects/vnet/contrib/openbsm/TODO
  projects/vnet/contrib/openbsm/VERSION
  projects/vnet/contrib/openbsm/autogen.sh
  projects/vnet/contrib/openbsm/bin/Makefile.am
  projects/vnet/contrib/openbsm/bin/audit/Makefile.am
  projects/vnet/contrib/openbsm/bin/audit/audit.8
  projects/vnet/contrib/openbsm/bin/audit/audit.c
  projects/vnet/contrib/openbsm/bin/auditd/Makefile.am
  projects/vnet/contrib/openbsm/bin/auditd/audit_triggers.defs
  projects/vnet/contrib/openbsm/bin/auditd/audit_warn.c
  projects/vnet/contrib/openbsm/bin/auditd/auditd.8
  projects/vnet/contrib/openbsm/bin/auditd/auditd.c
  projects/vnet/contrib/openbsm/bin/auditd/auditd.h
  projects/vnet/contrib/openbsm/bin/auditd/auditd_control.defs
  projects/vnet/contrib/openbsm/bin/auditd/auditd_darwin.c
  projects/vnet/contrib/openbsm/bin/auditd/auditd_fbsd.c
  projects/vnet/contrib/openbsm/bin/auditdistd/Makefile.am
  projects/vnet/contrib/openbsm/bin/auditdistd/auditdistd.8
  projects/vnet/contrib/openbsm/bin/auditdistd/auditdistd.c
  projects/vnet/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
  projects/vnet/contrib/openbsm/bin/auditdistd/auditdistd.h
  projects/vnet/contrib/openbsm/bin/auditdistd/faccessat.h
  projects/vnet/contrib/openbsm/bin/auditdistd/fstatat.h
  projects/vnet/contrib/openbsm/bin/auditdistd/openat.h
  projects/vnet/contrib/openbsm/bin/auditdistd/parse.y
  projects/vnet/contrib/openbsm/bin/auditdistd/pjdlog.c
  projects/vnet/contrib/openbsm/bin/auditdistd/pjdlog.h
  projects/vnet/contrib/openbsm/bin/auditdistd/proto.c
  projects/vnet/contrib/openbsm/bin/auditdistd/proto.h
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_common.c
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_impl.h
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_socketpair.c
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_tcp.c
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_tls.c
  projects/vnet/contrib/openbsm/bin/auditdistd/proto_uds.c
  projects/vnet/contrib/openbsm/bin/auditdistd/receiver.c
  projects/vnet/contrib/openbsm/bin/auditdistd/renameat.h
  projects/vnet/contrib/openbsm/bin/auditdistd/sandbox.c
  projects/vnet/contrib/openbsm/bin/auditdistd/sandbox.h
  projects/vnet/contrib/openbsm/bin/auditdistd/sender.c
  projects/vnet/contrib/openbsm/bin/auditdistd/sigtimedwait.h
  projects/vnet/contrib/openbsm/bin/auditdistd/strndup.h
  projects/vnet/contrib/openbsm/bin/auditdistd/subr.c
  projects/vnet/contrib/openbsm/bin/auditdistd/subr.h
  projects/vnet/contrib/openbsm/bin/auditdistd/synch.h
  projects/vnet/contrib/openbsm/bin/auditdistd/token.l
  projects/vnet/contrib/openbsm/bin/auditdistd/trail.c
  projects/vnet/contrib/openbsm/bin/auditdistd/trail.h
  projects/vnet/contrib/openbsm/bin/auditdistd/unlinkat.h
  projects/vnet/contrib/openbsm/bin/auditfilterd/Makefile.am
  projects/vnet/contrib/openbsm/bin/auditfilterd/auditfilterd.8
  projects/vnet/contrib/openbsm/bin/auditfilterd/auditfilterd.c
  projects/vnet/contrib/openbsm/bin/auditfilterd/auditfilterd.h
  projects/vnet/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
  projects/vnet/contrib/openbsm/bin/auditreduce/Makefile.am
  projects/vnet/contrib/openbsm/bin/auditreduce/auditreduce.1
  projects/vnet/contrib/openbsm/bin/auditreduce/auditreduce.c
  projects/vnet/contrib/openbsm/bin/auditreduce/auditreduce.h
  projects/vnet/contrib/openbsm/bin/praudit/Makefile.am
  projects/vnet/contrib/openbsm/bin/praudit/praudit.1
  projects/vnet/contrib/openbsm/bin/praudit/praudit.c
  projects/vnet/contrib/openbsm/bsm/Makefile.am
  projects/vnet/contrib/openbsm/bsm/audit_filter.h
  projects/vnet/contrib/openbsm/bsm/audit_uevents.h
  projects/vnet/contrib/openbsm/bsm/auditd_lib.h
  projects/vnet/contrib/openbsm/bsm/libbsm.h
  projects/vnet/contrib/openbsm/compat/clock_gettime.h
  projects/vnet/contrib/openbsm/compat/closefrom.h
  projects/vnet/contrib/openbsm/compat/compat.h
  projects/vnet/contrib/openbsm/compat/endian.h
  projects/vnet/contrib/openbsm/compat/endian_enc.h
  projects/vnet/contrib/openbsm/compat/flopen.h
  projects/vnet/contrib/openbsm/compat/pidfile.h
  projects/vnet/contrib/openbsm/compat/queue.h
  projects/vnet/contrib/openbsm/compat/strlcat.h
  projects/vnet/contrib/openbsm/compat/strlcpy.h
  projects/vnet/contrib/openbsm/config/config.h
  projects/vnet/contrib/openbsm/configure
  projects/vnet/contrib/openbsm/configure.ac
  projects/vnet/contrib/openbsm/etc/audit_class
  projects/vnet/contrib/openbsm/etc/audit_control
  projects/vnet/contrib/openbsm/etc/audit_event
  projects/vnet/contrib/openbsm/etc/audit_filter
  projects/vnet/contrib/openbsm/etc/audit_user
  projects/vnet/contrib/openbsm/etc/audit_warn
  projects/vnet/contrib/openbsm/libauditd/Makefile.am
  projects/vnet/contrib/openbsm/libauditd/auditd_lib.c
  projects/vnet/contrib/openbsm/libauditd/libauditd.3
  projects/vnet/contrib/openbsm/libbsm/Makefile.am
  projects/vnet/contrib/openbsm/libbsm/Makefile.in
  projects/vnet/contrib/openbsm/libbsm/au_class.3
  projects/vnet/contrib/openbsm/libbsm/au_control.3
  projects/vnet/contrib/openbsm/libbsm/au_domain.3
  projects/vnet/contrib/openbsm/libbsm/au_errno.3
  projects/vnet/contrib/openbsm/libbsm/au_event.3
  projects/vnet/contrib/openbsm/libbsm/au_fcntl_cmd.3
  projects/vnet/contrib/openbsm/libbsm/au_free_token.3
  projects/vnet/contrib/openbsm/libbsm/au_io.3
  projects/vnet/contrib/openbsm/libbsm/au_mask.3
  projects/vnet/contrib/openbsm/libbsm/au_open.3
  projects/vnet/contrib/openbsm/libbsm/au_socket_type.3
  projects/vnet/contrib/openbsm/libbsm/au_token.3
  projects/vnet/contrib/openbsm/libbsm/au_user.3
  projects/vnet/contrib/openbsm/libbsm/audit_submit.3
  projects/vnet/contrib/openbsm/libbsm/bsm_audit.c
  projects/vnet/contrib/openbsm/libbsm/bsm_class.c
  projects/vnet/contrib/openbsm/libbsm/bsm_control.c
  projects/vnet/contrib/openbsm/libbsm/bsm_domain.c
  projects/vnet/contrib/openbsm/libbsm/bsm_errno.c
  projects/vnet/contrib/openbsm/libbsm/bsm_event.c
  projects/vnet/contrib/openbsm/libbsm/bsm_fcntl.c
  projects/vnet/contrib/openbsm/libbsm/bsm_flags.c
  projects/vnet/contrib/openbsm/libbsm/bsm_io.c
  projects/vnet/contrib/openbsm/libbsm/bsm_mask.c
  projects/vnet/contrib/openbsm/libbsm/bsm_notify.c
  projects/vnet/contrib/openbsm/libbsm/bsm_socket_type.c
  projects/vnet/contrib/openbsm/libbsm/bsm_token.c
  projects/vnet/contrib/openbsm/libbsm/bsm_user.c
  projects/vnet/contrib/openbsm/libbsm/bsm_wrappers.c
  projects/vnet/contrib/openbsm/libbsm/libbsm.3
  projects/vnet/contrib/openbsm/man/Makefile.am
  projects/vnet/contrib/openbsm/man/Makefile.in
  projects/vnet/contrib/openbsm/man/audit.2
  projects/vnet/contrib/openbsm/man/audit.log.5
  projects/vnet/contrib/openbsm/man/audit_class.5
  projects/vnet/contrib/openbsm/man/audit_control.5
  projects/vnet/contrib/openbsm/man/audit_event.5
  projects/vnet/contrib/openbsm/man/audit_user.5
  projects/vnet/contrib/openbsm/man/audit_warn.5
  projects/vnet/contrib/openbsm/man/auditctl.2
  projects/vnet/contrib/openbsm/man/auditon.2
  projects/vnet/contrib/openbsm/man/getaudit.2
  projects/vnet/contrib/openbsm/man/getauid.2
  projects/vnet/contrib/openbsm/man/setaudit.2
  projects/vnet/contrib/openbsm/man/setauid.2
  projects/vnet/contrib/openbsm/modules/Makefile.am
  projects/vnet/contrib/openbsm/modules/auditfilter_noop/Makefile.am
  projects/vnet/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
  projects/vnet/contrib/openbsm/sys/Makefile.am
  projects/vnet/contrib/openbsm/sys/bsm/Makefile.am
  projects/vnet/contrib/openbsm/sys/bsm/audit.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_domain.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_errno.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_fcntl.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_internal.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_kevents.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_record.h
  projects/vnet/contrib/openbsm/sys/bsm/audit_socket_type.h
  projects/vnet/contrib/openbsm/test/Makefile.am
  projects/vnet/contrib/openbsm/test/bsm/Makefile.am
  projects/vnet/contrib/openbsm/test/bsm/generate.c
  projects/vnet/contrib/openbsm/tools/Makefile.am
  projects/vnet/contrib/openbsm/tools/audump.c
  projects/vnet/contrib/smbfs/README
  projects/vnet/contrib/smbfs/lib/smb/nb_name.c
  projects/vnet/contrib/top/loadavg.h
  projects/vnet/contrib/unbound/Makefile.in
  projects/vnet/contrib/unbound/acx_nlnetlabs.m4
  projects/vnet/contrib/unbound/compat/arc4random.c
  projects/vnet/contrib/unbound/compat/getentropy_linux.c
  projects/vnet/contrib/unbound/compat/getentropy_solaris.c
  projects/vnet/contrib/unbound/compat/reallocarray.c
  projects/vnet/contrib/unbound/compat/sha512.c
  projects/vnet/contrib/unbound/compat/snprintf.c
  projects/vnet/contrib/unbound/config.h
  projects/vnet/contrib/unbound/config.h.in
  projects/vnet/contrib/unbound/configure
  projects/vnet/contrib/unbound/configure.ac
  projects/vnet/contrib/unbound/daemon/remote.c
  projects/vnet/contrib/unbound/daemon/unbound.c
  projects/vnet/contrib/unbound/daemon/worker.c
  projects/vnet/contrib/unbound/dns64/dns64.c
  projects/vnet/contrib/unbound/dnstap/dnstap.proto
  projects/vnet/contrib/unbound/doc/Changelog
  projects/vnet/contrib/unbound/doc/README
  projects/vnet/contrib/unbound/doc/example.conf
  projects/vnet/contrib/unbound/doc/example.conf.in
  projects/vnet/contrib/unbound/doc/libunbound.3
  projects/vnet/contrib/unbound/doc/libunbound.3.in
  projects/vnet/contrib/unbound/doc/unbound-anchor.8
  projects/vnet/contrib/unbound/doc/unbound-anchor.8.in
  projects/vnet/contrib/unbound/doc/unbound-checkconf.8
  projects/vnet/contrib/unbound/doc/unbound-checkconf.8.in
  projects/vnet/contrib/unbound/doc/unbound-control.8
  projects/vnet/contrib/unbound/doc/unbound-control.8.in
  projects/vnet/contrib/unbound/doc/unbound-host.1
  projects/vnet/contrib/unbound/doc/unbound-host.1.in
  projects/vnet/contrib/unbound/doc/unbound.8
  projects/vnet/contrib/unbound/doc/unbound.8.in
  projects/vnet/contrib/unbound/doc/unbound.conf.5
  projects/vnet/contrib/unbound/doc/unbound.conf.5.in
  projects/vnet/contrib/unbound/freebsd-configure.sh
  projects/vnet/contrib/unbound/iterator/iter_scrub.c
  projects/vnet/contrib/unbound/iterator/iter_utils.c
  projects/vnet/contrib/unbound/iterator/iterator.c
  projects/vnet/contrib/unbound/iterator/iterator.h
  projects/vnet/contrib/unbound/libunbound/libunbound.c
  projects/vnet/contrib/unbound/libunbound/python/Makefile
  projects/vnet/contrib/unbound/libunbound/python/doc/install.rst
  projects/vnet/contrib/unbound/libunbound/python/doc/modules/unbound.rst
  projects/vnet/contrib/unbound/libunbound/python/examples/dnssec-valid.py
  projects/vnet/contrib/unbound/libunbound/python/libunbound.i
  projects/vnet/contrib/unbound/ltmain.sh
  projects/vnet/contrib/unbound/services/cache/dns.c
  projects/vnet/contrib/unbound/services/cache/rrset.c
  projects/vnet/contrib/unbound/sldns/parseutil.h
  projects/vnet/contrib/unbound/sldns/wire2str.c
  projects/vnet/contrib/unbound/smallapp/unbound-anchor.c
  projects/vnet/contrib/unbound/smallapp/unbound-checkconf.c
  projects/vnet/contrib/unbound/smallapp/unbound-control-setup.sh
  projects/vnet/contrib/unbound/smallapp/unbound-control-setup.sh.in
  projects/vnet/contrib/unbound/smallapp/unbound-control.c
  projects/vnet/contrib/unbound/util/config_file.c
  projects/vnet/contrib/unbound/util/config_file.h
  projects/vnet/contrib/unbound/util/configlexer.lex
  projects/vnet/contrib/unbound/util/configparser.y
  projects/vnet/contrib/unbound/util/iana_ports.inc
  projects/vnet/contrib/unbound/util/locks.c
  projects/vnet/contrib/unbound/util/net_help.c
  projects/vnet/contrib/unbound/util/random.c
  projects/vnet/contrib/unbound/util/rbtree.c
  projects/vnet/contrib/unbound/util/rtt.h
  projects/vnet/contrib/unbound/util/storage/lookup3.c
  projects/vnet/contrib/unbound/util/tube.h
  projects/vnet/contrib/unbound/util/winsock_event.h
  projects/vnet/contrib/unbound/validator/autotrust.c
  projects/vnet/contrib/unbound/validator/val_neg.c
  projects/vnet/contrib/unbound/validator/val_neg.h
  projects/vnet/contrib/unbound/validator/val_nsec.c
  projects/vnet/contrib/unbound/validator/val_nsec.h
  projects/vnet/contrib/unbound/validator/val_nsec3.c
  projects/vnet/contrib/unbound/validator/val_nsec3.h
  projects/vnet/contrib/unbound/validator/val_secalgo.c
  projects/vnet/contrib/unbound/validator/val_secalgo.h
  projects/vnet/contrib/unbound/validator/val_sigcrypt.c
  projects/vnet/contrib/unbound/validator/val_utils.h
  projects/vnet/contrib/unbound/validator/validator.c
  projects/vnet/crypto/openssh/digest-libc.c
  projects/vnet/etc/mtree/BSD.tests.dist
  projects/vnet/etc/mtree/BSD.usr.dist
  projects/vnet/etc/periodic/daily/800.scrub-zfs
  projects/vnet/etc/rc.subr
  projects/vnet/etc/services
  projects/vnet/include/netdb.h
  projects/vnet/include/resolv.h
  projects/vnet/kerberos5/lib/libgssapi_krb5/Makefile.depend
  projects/vnet/kerberos5/lib/libgssapi_ntlm/Makefile.depend
  projects/vnet/kerberos5/lib/libhdb/Makefile.depend
  projects/vnet/kerberos5/lib/libheimntlm/Makefile.depend
  projects/vnet/kerberos5/lib/libkadm5clnt/Makefile.depend
  projects/vnet/kerberos5/lib/libkadm5srv/Makefile.depend
  projects/vnet/kerberos5/lib/libkafs5/Makefile.depend
  projects/vnet/kerberos5/lib/libkdc/Makefile.depend
  projects/vnet/lib/Makefile
  projects/vnet/lib/csu/aarch64/crt1.c
  projects/vnet/lib/csu/amd64/crt1.c
  projects/vnet/lib/csu/arm/crt1.c
  projects/vnet/lib/csu/i386/crt1_c.c
  projects/vnet/lib/csu/mips/crt1.c
  projects/vnet/lib/csu/powerpc/crt1.c
  projects/vnet/lib/csu/powerpc64/crt1.c
  projects/vnet/lib/csu/sparc64/crt1.c
  projects/vnet/lib/lib80211/Makefile.depend
  projects/vnet/lib/lib80211/lib80211.3
  projects/vnet/lib/libbsm/Makefile
  projects/vnet/lib/libc/aarch64/sys/Makefile.inc
  projects/vnet/lib/libc/arm/sys/Makefile.inc
  projects/vnet/lib/libc/gen/exec.3
  projects/vnet/lib/libc/gen/getnetgrent.c
  projects/vnet/lib/libc/gen/getpeereid.c
  projects/vnet/lib/libc/gen/lockf.c
  projects/vnet/lib/libc/gen/sysconf.c
  projects/vnet/lib/libc/iconv/citrus_mmap.c
  projects/vnet/lib/libc/net/getaddrinfo.3
  projects/vnet/lib/libc/net/getaddrinfo.c
  projects/vnet/lib/libc/net/map_v4v6.c
  projects/vnet/lib/libc/net/name6.c
  projects/vnet/lib/libc/net/rcmdsh.c
  projects/vnet/lib/libc/regex/grot/Makefile
  projects/vnet/lib/libc/regex/grot/debug.c
  projects/vnet/lib/libc/regex/grot/main.c
  projects/vnet/lib/libc/regex/grot/split.c
  projects/vnet/lib/libc/resolv/res_init.c
  projects/vnet/lib/libc/resolv/res_mkquery.c
  projects/vnet/lib/libc/resolv/res_mkupdate.c
  projects/vnet/lib/libc/resolv/res_private.h
  projects/vnet/lib/libc/resolv/res_query.c
  projects/vnet/lib/libc/resolv/res_send.c
  projects/vnet/lib/libc/resolv/res_state.c
  projects/vnet/lib/libc/rpc/svc_vc.c
  projects/vnet/lib/libc/stdio/open_memstream.c
  projects/vnet/lib/libc/stdio/open_wmemstream.c
  projects/vnet/lib/libc/sys/brk.2
  projects/vnet/lib/libc/sys/clock_gettime.2
  projects/vnet/lib/libc/sys/getgid.2
  projects/vnet/lib/libc/sys/getpid.2
  projects/vnet/lib/libc/sys/gettimeofday.2
  projects/vnet/lib/libc/sys/getuid.2
  projects/vnet/lib/libc/sys/read.2
  projects/vnet/lib/libc/sys/setuid.2
  projects/vnet/lib/libc/sys/utrace.2
  projects/vnet/lib/libc/sys/write.2
  projects/vnet/lib/libc/tests/Makefile
  projects/vnet/lib/libc/tests/ssp/Makefile
  projects/vnet/lib/libc/tests/stdio/getdelim_test.c
  projects/vnet/lib/libc/tests/stdio/printbasic_test.c
  projects/vnet/lib/libc/tests/stdio/printfloat_test.c
  projects/vnet/lib/libcuse/cuse_lib.c
  projects/vnet/lib/libfetch/http.c
  projects/vnet/lib/libopenbsd/Makefile
  projects/vnet/lib/libopenbsd/imsg.c
  projects/vnet/lib/libpam/modules/pam_krb5/Makefile.depend
  projects/vnet/lib/libpam/modules/pam_ksu/Makefile.depend
  projects/vnet/lib/libpam/modules/pam_ssh/Makefile
  projects/vnet/lib/libstand/Makefile
  projects/vnet/lib/libstand/bootp.c
  projects/vnet/lib/libstand/tftp.c
  projects/vnet/lib/libthr/thread/thr_init.c
  projects/vnet/lib/libthr/thread/thr_private.h
  projects/vnet/lib/msun/tests/Makefile
  projects/vnet/libexec/rtld-elf/rtld.c
  projects/vnet/sbin/devd/devd.cc
  projects/vnet/sbin/geom/class/multipath/geom_multipath.c
  projects/vnet/sbin/geom/class/part/gpart.8
  projects/vnet/sbin/mount/mount.c
  projects/vnet/sbin/newfs_msdos/mkfs_msdos.c
  projects/vnet/sbin/reboot/reboot.8
  projects/vnet/sbin/reboot/reboot.c
  projects/vnet/sbin/swapon/swapon.c
  projects/vnet/sbin/sysctl/sysctl.8
  projects/vnet/sbin/sysctl/sysctl.c
  projects/vnet/secure/lib/libcrypto/engines/Makefile
  projects/vnet/secure/lib/libssh/Makefile
  projects/vnet/secure/libexec/sftp-server/Makefile
  projects/vnet/secure/libexec/ssh-keysign/Makefile
  projects/vnet/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/vnet/secure/usr.bin/scp/Makefile
  projects/vnet/secure/usr.bin/sftp/Makefile
  projects/vnet/secure/usr.bin/ssh-add/Makefile
  projects/vnet/secure/usr.bin/ssh-agent/Makefile
  projects/vnet/secure/usr.bin/ssh-keygen/Makefile
  projects/vnet/secure/usr.bin/ssh-keyscan/Makefile
  projects/vnet/secure/usr.bin/ssh/Makefile
  projects/vnet/secure/usr.sbin/sshd/Makefile
  projects/vnet/share/colldef/Makefile
  projects/vnet/share/ctypedef/Makefile
  projects/vnet/share/examples/etc/make.conf
  projects/vnet/share/examples/tests/tests/atf/printf_test.c
  projects/vnet/share/man/man4/aesni.4
  projects/vnet/share/man/man4/blackhole.4
  projects/vnet/share/man/man4/crypto.4
  projects/vnet/share/man/man4/dtrace_io.4
  projects/vnet/share/man/man4/dtrace_ip.4
  projects/vnet/share/man/man4/dtrace_tcp.4
  projects/vnet/share/man/man4/dtrace_udp.4
  projects/vnet/share/man/man4/ioat.4
  projects/vnet/share/man/man4/isp.4
  projects/vnet/share/man/man4/mlx5en.4
  projects/vnet/share/man/man4/mps.4
  projects/vnet/share/man/man4/netmap.4
  projects/vnet/share/man/man4/pass.4
  projects/vnet/share/man/man4/sfxge.4
  projects/vnet/share/man/man5/src.conf.5
  projects/vnet/share/man/man7/release.7
  projects/vnet/share/man/man7/tests.7
  projects/vnet/share/man/man9/BUS_DESCRIBE_INTR.9
  projects/vnet/share/man/man9/Makefile
  projects/vnet/share/man/man9/VOP_GETPAGES.9
  projects/vnet/share/man/man9/g_bio.9
  projects/vnet/share/man/man9/style.9
  projects/vnet/share/man/man9/zone.9
  projects/vnet/share/misc/bsd-family-tree
  projects/vnet/share/mk/atf.test.mk
  projects/vnet/share/mk/bsd.README
  projects/vnet/share/mk/bsd.compiler.mk
  projects/vnet/share/mk/bsd.cpu.mk
  projects/vnet/share/mk/bsd.dep.mk
  projects/vnet/share/mk/bsd.endian.mk
  projects/vnet/share/mk/bsd.lib.mk
  projects/vnet/share/mk/bsd.libnames.mk
  projects/vnet/share/mk/bsd.opts.mk
  projects/vnet/share/mk/bsd.snmpmod.mk
  projects/vnet/share/mk/bsd.sys.mk
  projects/vnet/share/mk/bsd.test.mk
  projects/vnet/share/mk/local.dirdeps.mk
  projects/vnet/share/mk/local.meta.sys.mk
  projects/vnet/share/mk/src.libnames.mk
  projects/vnet/share/mk/src.opts.mk
  projects/vnet/share/mk/suite.test.mk
  projects/vnet/share/mk/sys.mk
  projects/vnet/share/mk/tap.test.mk
  projects/vnet/share/monetdef/Makefile
  projects/vnet/share/msgdef/Makefile
  projects/vnet/share/numericdef/Makefile
  projects/vnet/share/timedef/Makefile
  projects/vnet/share/timedef/ja_JP.SJIS.src
  projects/vnet/share/timedef/ja_JP.UTF-8.src
  projects/vnet/share/timedef/ja_JP.eucJP.src
  projects/vnet/sys/amd64/amd64/machdep.c
  projects/vnet/sys/amd64/amd64/pmap.c
  projects/vnet/sys/amd64/include/md_var.h
  projects/vnet/sys/amd64/include/smp.h
  projects/vnet/sys/arm/allwinner/a10_mmc.c
  projects/vnet/sys/arm/allwinner/a20/a20_mp.c
  projects/vnet/sys/arm/altera/socfpga/socfpga_mp.c
  projects/vnet/sys/arm/amlogic/aml8726/aml8726_mmc.c
  projects/vnet/sys/arm/amlogic/aml8726/aml8726_mp.c
  projects/vnet/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
  projects/vnet/sys/arm/annapurna/alpine/alpine_machdep_mp.c
  projects/vnet/sys/arm/arm/elf_machdep.c
  projects/vnet/sys/arm/arm/exception.S
  projects/vnet/sys/arm/arm/genassym.c
  projects/vnet/sys/arm/arm/generic_timer.c
  projects/vnet/sys/arm/arm/gic.c
  projects/vnet/sys/arm/arm/intr.c
  projects/vnet/sys/arm/arm/locore-v4.S
  projects/vnet/sys/arm/arm/machdep.c
  projects/vnet/sys/arm/arm/mp_machdep.c
  projects/vnet/sys/arm/arm/nexus.c
  projects/vnet/sys/arm/arm/pmap-v6-new.c
  projects/vnet/sys/arm/arm/trap-v6.c
  projects/vnet/sys/arm/arm/trap.c
  projects/vnet/sys/arm/arm/undefined.c
  projects/vnet/sys/arm/at91/at91_mci.c
  projects/vnet/sys/arm/at91/std.bwct
  projects/vnet/sys/arm/at91/std.eb9200
  projects/vnet/sys/arm/at91/std.ethernut5
  projects/vnet/sys/arm/at91/std.hl200
  projects/vnet/sys/arm/at91/std.hl201
  projects/vnet/sys/arm/at91/std.kb920x
  projects/vnet/sys/arm/at91/std.qila9g20
  projects/vnet/sys/arm/at91/std.sam9260ek
  projects/vnet/sys/arm/at91/std.sam9g20ek
  projects/vnet/sys/arm/at91/std.sam9x25ek
  projects/vnet/sys/arm/at91/std.sn9g45
  projects/vnet/sys/arm/at91/std.tsc4370
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
  projects/vnet/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/vnet/sys/arm/cavium/cns11xx/std.econa
  projects/vnet/sys/arm/conf/ATMEL
  projects/vnet/sys/arm/conf/CNS11XXNAS
  projects/vnet/sys/arm/conf/CRB
  projects/vnet/sys/arm/conf/GUMSTIX
  projects/vnet/sys/arm/conf/IMX6
  projects/vnet/sys/arm/conf/NOTES
  projects/vnet/sys/arm/conf/NSLU
  projects/vnet/sys/arm/conf/SAM9260EK
  projects/vnet/sys/arm/conf/SAM9G20EK
  projects/vnet/sys/arm/freescale/imx/files.imx6
  projects/vnet/sys/arm/freescale/imx/imx6_ccm.c
  projects/vnet/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/vnet/sys/arm/freescale/imx/imx6_mp.c
  projects/vnet/sys/arm/freescale/imx/imx_ccmvar.h
  projects/vnet/sys/arm/freescale/imx/imx_gpio.c
  projects/vnet/sys/arm/freescale/imx/imx_sdhci.c
  projects/vnet/sys/arm/include/cpufunc.h
  projects/vnet/sys/arm/include/intr.h
  projects/vnet/sys/arm/include/md_var.h
  projects/vnet/sys/arm/include/ofw_machdep.h
  projects/vnet/sys/arm/include/pmap-v6.h
  projects/vnet/sys/arm/include/smp.h
  projects/vnet/sys/arm/include/trap.h
  projects/vnet/sys/arm/include/vdso.h
  projects/vnet/sys/arm/include/vmparam.h
  projects/vnet/sys/arm/lpc/lpc_mmc.c
  projects/vnet/sys/arm/lpc/std.lpc
  projects/vnet/sys/arm/mv/discovery/std.db78xxx
  projects/vnet/sys/arm/mv/kirkwood/std.kirkwood
  projects/vnet/sys/arm/mv/orion/std.db88f5xxx
  projects/vnet/sys/arm/mv/orion/std.ts7800
  projects/vnet/sys/arm/qemu/virt_mp.c
  projects/vnet/sys/arm/rockchip/rk30xx_mp.c
  projects/vnet/sys/arm/samsung/exynos/exynos5_mp.c
  projects/vnet/sys/arm/ti/aintc.c
  projects/vnet/sys/arm/ti/omap4/omap4_mp.c
  projects/vnet/sys/arm/ti/ti_sdhci.c
  projects/vnet/sys/arm/xilinx/zy7_mp.c
  projects/vnet/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/vnet/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/vnet/sys/arm/xscale/i8134x/crb_machdep.c
  projects/vnet/sys/arm/xscale/ixp425/avila_machdep.c
  projects/vnet/sys/arm/xscale/ixp425/std.avila
  projects/vnet/sys/arm/xscale/pxa/pxa_machdep.c
  projects/vnet/sys/arm64/arm64/elf_machdep.c
  projects/vnet/sys/arm64/arm64/exception.S
  projects/vnet/sys/arm64/arm64/gic.c
  projects/vnet/sys/arm64/arm64/gic.h
  projects/vnet/sys/arm64/arm64/gic_fdt.c
  projects/vnet/sys/arm64/arm64/gic_v3_its.c
  projects/vnet/sys/arm64/arm64/gic_v3_var.h
  projects/vnet/sys/arm64/arm64/intr_machdep.c
  projects/vnet/sys/arm64/arm64/machdep.c
  projects/vnet/sys/arm64/arm64/pic_if.m
  projects/vnet/sys/arm64/cavium/thunder_pcie.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_common.c
  projects/vnet/sys/arm64/cavium/thunder_pcie_pem.c
  projects/vnet/sys/arm64/conf/GENERIC
  projects/vnet/sys/arm64/include/intr.h
  projects/vnet/sys/arm64/include/md_var.h
  projects/vnet/sys/arm64/include/ofw_machdep.h
  projects/vnet/sys/arm64/include/vdso.h
  projects/vnet/sys/arm64/include/vmparam.h
  projects/vnet/sys/boot/common/part.c
  projects/vnet/sys/boot/efi/boot1/boot1.c
  projects/vnet/sys/boot/efi/loader/Makefile
  projects/vnet/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
  projects/vnet/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/vnet/sys/boot/efi/loader/arch/arm/exec.c
  projects/vnet/sys/boot/efi/loader/arch/arm64/exec.c
  projects/vnet/sys/boot/efi/loader/bootinfo.c
  projects/vnet/sys/boot/efi/loader/devicename.c
  projects/vnet/sys/boot/efi/loader/loader_efi.h
  projects/vnet/sys/boot/efi/loader/main.c
  projects/vnet/sys/boot/i386/libi386/biosmem.c
  projects/vnet/sys/boot/i386/libi386/libi386.h
  projects/vnet/sys/boot/i386/libi386/pxe.c
  projects/vnet/sys/boot/i386/loader/main.c
  projects/vnet/sys/boot/libstand32/Makefile
  projects/vnet/sys/boot/uboot/common/main.c
  projects/vnet/sys/boot/userboot/test/Makefile.depend
  projects/vnet/sys/bsm/audit.h
  projects/vnet/sys/bsm/audit_domain.h
  projects/vnet/sys/bsm/audit_errno.h
  projects/vnet/sys/bsm/audit_fcntl.h
  projects/vnet/sys/bsm/audit_internal.h
  projects/vnet/sys/bsm/audit_kevents.h
  projects/vnet/sys/bsm/audit_record.h
  projects/vnet/sys/bsm/audit_socket_type.h
  projects/vnet/sys/cam/cam_ccb.h
  projects/vnet/sys/cam/cam_xpt.c
  projects/vnet/sys/cam/ctl/ctl.c
  projects/vnet/sys/cam/ctl/ctl_backend_block.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/vnet/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/vnet/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  projects/vnet/sys/cddl/dev/dtrace/dtrace_cddl.h
  projects/vnet/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/vnet/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/vnet/sys/cddl/dev/profile/profile.c
  projects/vnet/sys/cddl/dev/systrace/systrace.c
  projects/vnet/sys/compat/linux/linux_dtrace.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/compiler.h
  projects/vnet/sys/compat/linuxkpi/common/include/linux/workqueue.h
  projects/vnet/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/vnet/sys/conf/files
  projects/vnet/sys/conf/files.arm
  projects/vnet/sys/conf/files.arm64
  projects/vnet/sys/conf/files.mips
  projects/vnet/sys/conf/files.powerpc
  projects/vnet/sys/conf/kmod.mk
  projects/vnet/sys/conf/options
  projects/vnet/sys/conf/options.arm
  projects/vnet/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/vnet/sys/dev/aic/aic_pccard.c
  projects/vnet/sys/dev/an/if_an_pccard.c
  projects/vnet/sys/dev/ata/ata-card.c
  projects/vnet/sys/dev/atkbdc/psm.c
  projects/vnet/sys/dev/bwn/if_bwn.c
  projects/vnet/sys/dev/cmx/cmx_pccard.c
  projects/vnet/sys/dev/cs/if_cs_pccard.c
  projects/vnet/sys/dev/cxgbe/t4_main.c
  projects/vnet/sys/dev/drm2/i915/i915_gem.c
  projects/vnet/sys/dev/drm2/i915/intel_iic.c
  projects/vnet/sys/dev/drm2/ttm/ttm_bo.c
  projects/vnet/sys/dev/drm2/ttm/ttm_page_alloc.c
  projects/vnet/sys/dev/drm2/ttm/ttm_tt.c
  projects/vnet/sys/dev/ed/if_ed_isa.c
  projects/vnet/sys/dev/ed/if_ed_pccard.c
  projects/vnet/sys/dev/ed/if_ed_pci.c
  projects/vnet/sys/dev/ep/if_ep_pccard.c
  projects/vnet/sys/dev/etherswitch/arswitch/arswitch_9340.c
  projects/vnet/sys/dev/ex/if_ex_pccard.c
  projects/vnet/sys/dev/fdc/fdc_pccard.c
  projects/vnet/sys/dev/fdt/simplebus.c
  projects/vnet/sys/dev/fe/if_fe_pccard.c
  projects/vnet/sys/dev/hwpmc/hwpmc_core.c
  projects/vnet/sys/dev/hwpmc/hwpmc_logging.c
  projects/vnet/sys/dev/hyperv/utilities/hv_kvp.c
  projects/vnet/sys/dev/if_ndis/if_ndis_pci.c
  projects/vnet/sys/dev/ioat/ioat.c
  projects/vnet/sys/dev/ioat/ioat.h
  projects/vnet/sys/dev/ioat/ioat_hw.h
  projects/vnet/sys/dev/ioat/ioat_internal.h
  projects/vnet/sys/dev/ioat/ioat_test.c
  projects/vnet/sys/dev/ioat/ioat_test.h
  projects/vnet/sys/dev/iscsi/iscsi.c
  projects/vnet/sys/dev/isp/isp.c
  projects/vnet/sys/dev/isp/isp_freebsd.c
  projects/vnet/sys/dev/isp/isp_freebsd.h
  projects/vnet/sys/dev/isp/isp_pci.c
  projects/vnet/sys/dev/isp/isp_sbus.c
  projects/vnet/sys/dev/md/md.c
  projects/vnet/sys/dev/mlx5/device.h
  projects/vnet/sys/dev/mlx5/driver.h
  projects/vnet/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  projects/vnet/sys/dev/mlx5/mlx5_core/mlx5_vport.c
  projects/vnet/sys/dev/mlx5/mlx5_en/en.h
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/vnet/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/vnet/sys/dev/mlx5/vport.h
  projects/vnet/sys/dev/mmc/bridge.h
  projects/vnet/sys/dev/mmc/host/dwmmc.c
  projects/vnet/sys/dev/mmc/mmc.c
  projects/vnet/sys/dev/mpr/mpr_sas_lsi.c
  projects/vnet/sys/dev/mps/mps_sas_lsi.c
  projects/vnet/sys/dev/nand/nand_cdev.c
  projects/vnet/sys/dev/nand/nand_geom.c
  projects/vnet/sys/dev/ncv/ncr53c500_pccard.c
  projects/vnet/sys/dev/nsp/nsp_pccard.c
  projects/vnet/sys/dev/nvd/nvd.c
  projects/vnet/sys/dev/nvme/nvme.h
  projects/vnet/sys/dev/nvme/nvme_ns.c
  projects/vnet/sys/dev/nvme/nvme_sysctl.c
  projects/vnet/sys/dev/ofw/ofw_bus_subr.c
  projects/vnet/sys/dev/ofw/ofw_bus_subr.h
  projects/vnet/sys/dev/ofw/ofw_iicbus.c
  projects/vnet/sys/dev/ofw/openfirm.h
  projects/vnet/sys/dev/otus/if_otus.c
  projects/vnet/sys/dev/pccard/pccardvar.h
  projects/vnet/sys/dev/pci/pci_host_generic.c
  projects/vnet/sys/dev/ral/rt2560.c
  projects/vnet/sys/dev/ral/rt2661.c
  projects/vnet/sys/dev/ral/rt2860.c
  projects/vnet/sys/dev/sdhci/sdhci_fdt.c
  projects/vnet/sys/dev/sdhci/sdhci_pci.c
  projects/vnet/sys/dev/sfxge/common/ef10_tlv_layout.h
  projects/vnet/sys/dev/sfxge/common/efsys.h
  projects/vnet/sys/dev/sfxge/common/efx.h
  projects/vnet/sys/dev/sfxge/common/efx_check.h
  projects/vnet/sys/dev/sfxge/common/efx_crc32.c
  projects/vnet/sys/dev/sfxge/common/efx_filter.c
  projects/vnet/sys/dev/sfxge/common/efx_impl.h
  projects/vnet/sys/dev/sfxge/common/efx_mcdi.c
  projects/vnet/sys/dev/sfxge/common/efx_mcdi.h
  projects/vnet/sys/dev/sfxge/common/efx_nic.c
  projects/vnet/sys/dev/sfxge/common/efx_nvram.c
  projects/vnet/sys/dev/sfxge/common/efx_tx.c
  projects/vnet/sys/dev/sfxge/common/efx_types.h
  projects/vnet/sys/dev/sfxge/common/hunt_ev.c
  projects/vnet/sys/dev/sfxge/common/hunt_impl.h
  projects/vnet/sys/dev/sfxge/common/hunt_mcdi.c
  projects/vnet/sys/dev/sfxge/common/hunt_nic.c
  projects/vnet/sys/dev/sfxge/common/hunt_nvram.c
  projects/vnet/sys/dev/sfxge/common/hunt_tx.c
  projects/vnet/sys/dev/sfxge/common/siena_impl.h
  projects/vnet/sys/dev/sfxge/common/siena_mcdi.c
  projects/vnet/sys/dev/sfxge/common/siena_nic.c
  projects/vnet/sys/dev/sfxge/sfxge.c
  projects/vnet/sys/dev/sfxge/sfxge.h
  projects/vnet/sys/dev/sfxge/sfxge_mcdi.c
  projects/vnet/sys/dev/sfxge/sfxge_tx.c
  projects/vnet/sys/dev/sn/if_sn_pccard.c
  projects/vnet/sys/dev/snc/if_snc_pccard.c
  projects/vnet/sys/dev/sound/usb/uaudio.c
  projects/vnet/sys/dev/stg/tmc18c30_pccard.c
  projects/vnet/sys/dev/uart/uart_bus_pccard.c
  projects/vnet/sys/dev/uart/uart_dev_imx.h
  projects/vnet/sys/dev/usb/input/atp.c
  projects/vnet/sys/dev/usb/input/uep.c
  projects/vnet/sys/dev/usb/input/uhid.c
  projects/vnet/sys/dev/usb/input/ukbd.c
  projects/vnet/sys/dev/usb/input/ums.c
  projects/vnet/sys/dev/usb/input/wsp.c
  projects/vnet/sys/dev/usb/misc/udbp.c
  projects/vnet/sys/dev/usb/misc/ufm.c
  projects/vnet/sys/dev/usb/misc/ugold.c
  projects/vnet/sys/dev/usb/misc/uled.c
  projects/vnet/sys/dev/usb/net/if_aue.c
  projects/vnet/sys/dev/usb/net/if_axe.c
  projects/vnet/sys/dev/usb/net/if_axge.c
  projects/vnet/sys/dev/usb/net/if_cdce.c
  projects/vnet/sys/dev/usb/net/if_cue.c
  projects/vnet/sys/dev/usb/net/if_ipheth.c
  projects/vnet/sys/dev/usb/net/if_kue.c
  projects/vnet/sys/dev/usb/net/if_mos.c
  projects/vnet/sys/dev/usb/net/if_rue.c
  projects/vnet/sys/dev/usb/net/if_smsc.c
  projects/vnet/sys/dev/usb/net/if_udav.c
  projects/vnet/sys/dev/usb/net/if_urndis.c
  projects/vnet/sys/dev/usb/net/if_usie.c
  projects/vnet/sys/dev/usb/net/uhso.c
  projects/vnet/sys/dev/usb/serial/u3g.c
  projects/vnet/sys/dev/usb/serial/uark.c
  projects/vnet/sys/dev/usb/serial/ubsa.c
  projects/vnet/sys/dev/usb/serial/uchcom.c
  projects/vnet/sys/dev/usb/serial/ucycom.c
  projects/vnet/sys/dev/usb/serial/ufoma.c
  projects/vnet/sys/dev/usb/serial/uftdi.c
  projects/vnet/sys/dev/usb/serial/ugensa.c
  projects/vnet/sys/dev/usb/serial/uipaq.c
  projects/vnet/sys/dev/usb/serial/ulpt.c
  projects/vnet/sys/dev/usb/serial/umcs.c
  projects/vnet/sys/dev/usb/serial/umct.c
  projects/vnet/sys/dev/usb/serial/umodem.c
  projects/vnet/sys/dev/usb/serial/umoscom.c
  projects/vnet/sys/dev/usb/serial/uplcom.c
  projects/vnet/sys/dev/usb/serial/uslcom.c
  projects/vnet/sys/dev/usb/serial/uvisor.c
  projects/vnet/sys/dev/usb/serial/uvscom.c
  projects/vnet/sys/dev/usb/storage/umass.c
  projects/vnet/sys/dev/usb/storage/urio.c
  projects/vnet/sys/dev/usb/usb_hub.c
  projects/vnet/sys/dev/usb/usbdi.h
  projects/vnet/sys/dev/usb/wlan/if_rsu.c
  projects/vnet/sys/dev/usb/wlan/if_rum.c
  projects/vnet/sys/dev/usb/wlan/if_run.c
  projects/vnet/sys/dev/usb/wlan/if_uath.c
  projects/vnet/sys/dev/usb/wlan/if_upgt.c
  projects/vnet/sys/dev/usb/wlan/if_ural.c
  projects/vnet/sys/dev/usb/wlan/if_urtw.c
  projects/vnet/sys/dev/usb/wlan/if_urtwn.c
  projects/vnet/sys/dev/usb/wlan/if_urtwnreg.h
  projects/vnet/sys/dev/usb/wlan/if_urtwnvar.h
  projects/vnet/sys/dev/usb/wlan/if_zyd.c
  projects/vnet/sys/dev/wi/if_wi_pccard.c
  projects/vnet/sys/dev/wpi/if_wpi.c
  projects/vnet/sys/dev/wpi/if_wpi_debug.h
  projects/vnet/sys/dev/wtap/if_wtap_module.c
  projects/vnet/sys/dev/wtap/if_wtapvar.h
  projects/vnet/sys/dev/wtap/plugins/visibility.c
  projects/vnet/sys/dev/xe/if_xe_pccard.c
  projects/vnet/sys/fs/cuse/cuse.c
  projects/vnet/sys/fs/cuse/cuse_ioctl.h
  projects/vnet/sys/fs/fuse/fuse_vnops.c
  projects/vnet/sys/fs/nfsclient/nfs_clbio.c
  projects/vnet/sys/fs/smbfs/smbfs_io.c
  projects/vnet/sys/fs/tmpfs/tmpfs_subr.c
  projects/vnet/sys/geom/multipath/g_multipath.c
  projects/vnet/sys/geom/part/g_part_gpt.c
  projects/vnet/sys/i386/i386/mp_machdep.c
  projects/vnet/sys/i386/i386/pmap.c
  projects/vnet/sys/i386/i386/sys_machdep.c
  projects/vnet/sys/i386/include/md_var.h
  projects/vnet/sys/i386/include/smp.h
  projects/vnet/sys/kern/imgact_elf.c
  projects/vnet/sys/kern/kern_exec.c
  projects/vnet/sys/kern/kern_exit.c
  projects/vnet/sys/kern/kern_fork.c
  projects/vnet/sys/kern/kern_jail.c
  projects/vnet/sys/kern/kern_linker.c
  projects/vnet/sys/kern/kern_malloc.c
  projects/vnet/sys/kern/kern_mbuf.c
  projects/vnet/sys/kern/kern_proc.c
  projects/vnet/sys/kern/kern_racct.c
  projects/vnet/sys/kern/kern_rctl.c
  projects/vnet/sys/kern/kern_sig.c
  projects/vnet/sys/kern/kern_timeout.c
  projects/vnet/sys/kern/subr_syscall.c
  projects/vnet/sys/kern/sys_process.c
  projects/vnet/sys/kern/uipc_shm.c
  projects/vnet/sys/kern/uipc_syscalls.c
  projects/vnet/sys/kern/vfs_bio.c
  projects/vnet/sys/kern/vfs_cache.c
  projects/vnet/sys/kern/vfs_default.c
  projects/vnet/sys/kern/vfs_subr.c
  projects/vnet/sys/kern/vnode_if.src
  projects/vnet/sys/mips/atheros/apb.c
  projects/vnet/sys/mips/atheros/if_arge.c
  projects/vnet/sys/mips/atheros/qca953x_chip.c
  projects/vnet/sys/mips/include/cpuregs.h
  projects/vnet/sys/mips/include/ofw_machdep.h
  projects/vnet/sys/mips/include/pmap.h
  projects/vnet/sys/mips/mips/cpu.c
  projects/vnet/sys/mips/mips/pm_machdep.c
  projects/vnet/sys/mips/mips/pmap.c
  projects/vnet/sys/mips/mips/uma_machdep.c
  projects/vnet/sys/modules/Makefile
  projects/vnet/sys/modules/ahci/Makefile
  projects/vnet/sys/modules/cam/Makefile
  projects/vnet/sys/modules/geom/geom_sched/Makefile
  projects/vnet/sys/modules/mlx5/Makefile
  projects/vnet/sys/modules/mlx5en/Makefile
  projects/vnet/sys/net/if_llatbl.c
  projects/vnet/sys/net/if_llatbl.h
  projects/vnet/sys/net/if_stf.c
  projects/vnet/sys/net/route.c
  projects/vnet/sys/net/route.h
  projects/vnet/sys/net80211/ieee80211_phy.h
  projects/vnet/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
  projects/vnet/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/vnet/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/vnet/sys/netinet/cc/cc_cubic.c
  projects/vnet/sys/netinet/cc/cc_newreno.c
  projects/vnet/sys/netinet/if_ether.c
  projects/vnet/sys/netinet/in.c
  projects/vnet/sys/netinet/in_gif.c
  projects/vnet/sys/netinet/in_kdtrace.c
  projects/vnet/sys/netinet/in_kdtrace.h
  projects/vnet/sys/netinet/in_mcast.c
  projects/vnet/sys/netinet/ip_icmp.c
  projects/vnet/sys/netinet/ip_input.c
  projects/vnet/sys/netinet/ip_options.c
  projects/vnet/sys/netinet/ip_var.h
  projects/vnet/sys/netinet/sctp_cc_functions.c
  projects/vnet/sys/netinet/sctp_indata.c
  projects/vnet/sys/netinet/sctp_input.c
  projects/vnet/sys/netinet/sctp_output.c
  projects/vnet/sys/netinet/sctp_pcb.c
  projects/vnet/sys/netinet/sctp_pcb.h
  projects/vnet/sys/netinet/sctp_usrreq.c
  projects/vnet/sys/netinet/sctputil.c
  projects/vnet/sys/netinet/sctputil.h
  projects/vnet/sys/netinet/tcp.h
  projects/vnet/sys/netinet/tcp_hostcache.c
  projects/vnet/sys/netinet/tcp_hostcache.h
  projects/vnet/sys/netinet/tcp_input.c
  projects/vnet/sys/netinet/tcp_sack.c
  projects/vnet/sys/netinet/tcp_subr.c
  projects/vnet/sys/netinet/tcp_syncache.c
  projects/vnet/sys/netinet/tcp_timer.c
  projects/vnet/sys/netinet/tcp_usrreq.c
  projects/vnet/sys/netinet/tcp_var.h
  projects/vnet/sys/netinet/toecore.c
  projects/vnet/sys/netinet6/icmp6.c
  projects/vnet/sys/netinet6/in6.c
  projects/vnet/sys/netinet6/in6_gif.c
  projects/vnet/sys/netinet6/in6_mcast.c
  projects/vnet/sys/netinet6/in6_src.c
  projects/vnet/sys/netinet6/nd6.c
  projects/vnet/sys/netinet6/nd6_nbr.c
  projects/vnet/sys/netinet6/scope6.c
  projects/vnet/sys/netinet6/scope6_var.h
  projects/vnet/sys/netinet6/sctp6_usrreq.c
  projects/vnet/sys/netpfil/ipfw/ip_dn_io.c
  projects/vnet/sys/netpfil/ipfw/ip_dummynet.c
  projects/vnet/sys/netpfil/ipfw/ip_fw2.c
  projects/vnet/sys/ofed/drivers/net/mlx4/en_rx.c
  projects/vnet/sys/ofed/include/linux/mlx4/doorbell.h
  projects/vnet/sys/powerpc/booke/booke_machdep.c
  projects/vnet/sys/powerpc/booke/trap_subr.S
  projects/vnet/sys/powerpc/conf/GENERIC64
  projects/vnet/sys/powerpc/include/ofw_machdep.h
  projects/vnet/sys/powerpc/include/trap.h
  projects/vnet/sys/powerpc/mpc85xx/fsl_sdhc.c
  projects/vnet/sys/powerpc/ofw/ofw_machdep.c
  projects/vnet/sys/powerpc/powerpc/trap.c
  projects/vnet/sys/powerpc/pseries/phyp_llan.c
  projects/vnet/sys/security/audit/bsm_domain.c
  projects/vnet/sys/security/audit/bsm_errno.c
  projects/vnet/sys/security/audit/bsm_fcntl.c
  projects/vnet/sys/security/audit/bsm_socket_type.c
  projects/vnet/sys/security/audit/bsm_token.c
  projects/vnet/sys/security/mac/mac_framework.c
  projects/vnet/sys/security/mac/mac_internal.h
  projects/vnet/sys/sys/buf.h
  projects/vnet/sys/sys/efi.h
  projects/vnet/sys/sys/elf_common.h
  projects/vnet/sys/sys/linker.h
  projects/vnet/sys/sys/module.h
  projects/vnet/sys/sys/param.h
  projects/vnet/sys/sys/proc.h
  projects/vnet/sys/sys/ptrace.h
  projects/vnet/sys/sys/sysent.h
  projects/vnet/sys/sys/vnode.h
  projects/vnet/sys/ufs/ffs/ffs_softdep.c
  projects/vnet/sys/ufs/ufs/ufs_vnops.c
  projects/vnet/sys/vm/default_pager.c
  projects/vnet/sys/vm/device_pager.c
  projects/vnet/sys/vm/phys_pager.c
  projects/vnet/sys/vm/sg_pager.c
  projects/vnet/sys/vm/swap_pager.c
  projects/vnet/sys/vm/uma.h
  projects/vnet/sys/vm/uma_core.c
  projects/vnet/sys/vm/uma_int.h
  projects/vnet/sys/vm/vm_fault.c
  projects/vnet/sys/vm/vm_glue.c
  projects/vnet/sys/vm/vm_kern.c
  projects/vnet/sys/vm/vm_object.c
  projects/vnet/sys/vm/vm_object.h
  projects/vnet/sys/vm/vm_page.c
  projects/vnet/sys/vm/vm_page.h
  projects/vnet/sys/vm/vm_pageout.c
  projects/vnet/sys/vm/vm_pageout.h
  projects/vnet/sys/vm/vm_pager.c
  projects/vnet/sys/vm/vm_pager.h
  projects/vnet/sys/vm/vm_phys.c
  projects/vnet/sys/vm/vm_phys.h
  projects/vnet/sys/vm/vm_reserv.c
  projects/vnet/sys/vm/vm_reserv.h
  projects/vnet/sys/vm/vnode_pager.c
  projects/vnet/sys/vm/vnode_pager.h
  projects/vnet/sys/x86/include/specialreg.h
  projects/vnet/sys/x86/x86/busdma_bounce.c
  projects/vnet/sys/x86/x86/identcpu.c
  projects/vnet/sys/x86/x86/local_apic.c
  projects/vnet/targets/pseudo/gcc/Makefile.depend
  projects/vnet/targets/pseudo/universe/Makefile
  projects/vnet/tests/freebsd_test_suite/macros.h
  projects/vnet/tests/sys/Makefile
  projects/vnet/tests/sys/file/flock_test.sh
  projects/vnet/tools/bsdbox/Makefile.base
  projects/vnet/tools/build/mk/OptionalObsoleteFiles.inc
  projects/vnet/tools/build/options/makeman
  projects/vnet/tools/debugscripts/README
  projects/vnet/tools/regression/tls/ttls2/ttls2.c
  projects/vnet/tools/regression/tls/ttls4/ttls4.c
  projects/vnet/tools/tools/ath/athratestats/Makefile
  projects/vnet/tools/tools/ioat/ioatcontrol.8
  projects/vnet/tools/tools/ioat/ioatcontrol.c
  projects/vnet/tools/tools/locale/tools/cldr2def.pl
  projects/vnet/tools/tools/locale/tools/finalize   (contents, props changed)
  projects/vnet/tools/tools/nanobsd/defaults.sh
  projects/vnet/tools/tools/nanobsd/nanobsd.sh
  projects/vnet/tools/tools/nanobsd/pcengines/ALIX_NFS
  projects/vnet/tools/tools/nanobsd/pcengines/common.conf
  projects/vnet/usr.bin/bmake/Makefile
  projects/vnet/usr.bin/bmake/config.h
  projects/vnet/usr.bin/bmake/unit-tests/Makefile
  projects/vnet/usr.bin/calendar/calendars/calendar.freebsd
  projects/vnet/usr.bin/clang/lldb/Makefile
  projects/vnet/usr.bin/clang/lldb/Makefile.depend
  projects/vnet/usr.bin/kdump/Makefile
  projects/vnet/usr.bin/kdump/Makefile.depend
  projects/vnet/usr.bin/kdump/kdump.c
  projects/vnet/usr.bin/mkimg/mbr.c
  projects/vnet/usr.bin/mkimg/scheme.c
  projects/vnet/usr.bin/mkimg/scheme.h
  projects/vnet/usr.bin/netstat/ipsec.c
  projects/vnet/usr.bin/netstat/main.c
  projects/vnet/usr.bin/truss/Makefile
  projects/vnet/usr.bin/truss/Makefile.depend.amd64
  projects/vnet/usr.bin/truss/syscalls.c
  projects/vnet/usr.bin/unzip/unzip.1
  projects/vnet/usr.bin/unzip/unzip.c
  projects/vnet/usr.bin/xo/tests/Makefile
  projects/vnet/usr.sbin/Makefile
  projects/vnet/usr.sbin/Makefile.amd64
  projects/vnet/usr.sbin/Makefile.arm
  projects/vnet/usr.sbin/Makefile.i386
  projects/vnet/usr.sbin/Makefile.powerpc
  projects/vnet/usr.sbin/Makefile.sparc64
  projects/vnet/usr.sbin/boot0cfg/boot0cfg.c
  projects/vnet/usr.sbin/bsdinstall/scripts/netconfig
  projects/vnet/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/vnet/usr.sbin/ctm/ctm/ctm.1
  projects/vnet/usr.sbin/iostat/iostat.c
  projects/vnet/usr.sbin/jls/Makefile
  projects/vnet/usr.sbin/jls/jls.8
  projects/vnet/usr.sbin/jls/jls.c
  projects/vnet/usr.sbin/kldxref/kldxref.c
  projects/vnet/usr.sbin/makefs/makefs.c
  projects/vnet/usr.sbin/ndp/ndp.c
  projects/vnet/usr.sbin/ofwdump/Makefile.depend
  projects/vnet/usr.sbin/pmcstudy/pmcstudy.8
  projects/vnet/usr.sbin/pmcstudy/pmcstudy.c
  projects/vnet/usr.sbin/sesutil/Makefile
  projects/vnet/usr.sbin/sesutil/eltsub.c
  projects/vnet/usr.sbin/sesutil/eltsub.h
  projects/vnet/usr.sbin/sesutil/sesutil.c
  projects/vnet/usr.sbin/uhsoctl/uhsoctl.c
  projects/vnet/usr.sbin/ypldap/aldap.c
  projects/vnet/usr.sbin/ypldap/ber.c
  projects/vnet/usr.sbin/ypldap/ldapclient.c
  projects/vnet/usr.sbin/ypldap/ypldap.c
  projects/vnet/usr.sbin/ypldap/ypldap_dns.c
  projects/vnet/usr.sbin/ypserv/Makefile.yp
Directory Properties:
  projects/vnet/   (props changed)
  projects/vnet/cddl/   (props changed)
  projects/vnet/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/contrib/bmake/   (props changed)
  projects/vnet/contrib/elftoolchain/   (props changed)
  projects/vnet/contrib/llvm/   (props changed)
  projects/vnet/contrib/llvm/tools/lldb/   (props changed)
  projects/vnet/contrib/mdocml/   (props changed)
  projects/vnet/contrib/openbsm/   (props changed)
  projects/vnet/contrib/top/   (props changed)
  projects/vnet/contrib/unbound/   (props changed)
  projects/vnet/crypto/openssh/   (props changed)
  projects/vnet/include/   (props changed)
  projects/vnet/lib/libc/   (props changed)
  projects/vnet/sbin/   (props changed)
  projects/vnet/share/   (props changed)
  projects/vnet/share/man/man4/   (props changed)
  projects/vnet/sys/   (props changed)
  projects/vnet/sys/boot/   (props changed)
  projects/vnet/sys/cddl/contrib/opensolaris/   (props changed)
  projects/vnet/sys/conf/   (props changed)
  projects/vnet/sys/contrib/ipfilter/   (props changed)
  projects/vnet/sys/dev/hyperv/   (props changed)
  projects/vnet/targets/   (props changed)
  projects/vnet/usr.bin/calendar/   (props changed)
  projects/vnet/usr.bin/mkimg/   (props changed)

Modified: projects/vnet/MAINTAINERS
==============================================================================
--- projects/vnet/MAINTAINERS	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/MAINTAINERS	Tue Dec 22 13:58:11 2015	(r292600)
@@ -26,131 +26,64 @@ sub-system.
 
 subsystem	login	notes
 -----------------------------
-opencrypto	jmg	Pre-commit review requested.  Documentation Required.
-kqueue		jmg	Pre-commit review requested.  Documentation Required.
-share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
+atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 ath(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-net80211	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-openssl		benl,jkim	Pre-commit review requested.
-release/release.sh	gjb,re	Pre-commit review and regression tests
-				requested.
-sh(1)		jilles		Pre-commit review requested. This also applies
-				to kill(1), printf(1) and test(1) which are
-				compiled in as builtins.
-isci(4)		jimharris	Pre-commit review requested.
-nvme(4)		jimharris	Pre-commit review requested.
-nvd(4)		jimharris	Pre-commit review requested.
-nvmecontrol(8)	jimharris	Pre-commit review requested.
-libfetch	des	Pre-commit review requested.
-fetch		des	Pre-commit review requested.
-libpam		des	Pre-commit review requested.
-openssh		des	Pre-commit review requested.
-pseudofs	des	Pre-commit review requested.
-procfs		des	Pre-commit review requested.
-linprocfs	des	Pre-commit review requested.
+callout_*(9)	rrs		Pre-commit review requested -- becareful its tricksy code :o.
 contrib/compiler-rt	dim	Pre-commit review preferred.
 contrib/libc++		dim	Pre-commit review preferred.
 contrib/libcxxrt	dim	Pre-commit review preferred.
 contrib/llvm		dim	Pre-commit review preferred.
 contrib/llvm/tools/lldb	emaste	Pre-commit review preferred.
-atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 contrib/netbsd-tests	freebsd-testing,ngie	Pre-commit review requested.
 contrib/pjdfstest	freebsd-testing,ngie,pjd	Pre-commit review requested.
+dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+*env(3)		secteam	Due to the problematic security history of this
+			code, please have patches reviewed by secteam.
+etc/mail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+etc/sendmail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+fetch		des	Pre-commit review requested.
+geli		pjd	Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/).
+isci(4)		jimharris	Pre-commit review requested.
+iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+kqueue		jmg	Pre-commit review requested.  Documentation Required.
+libfetch	des	Pre-commit review requested.
+libpam		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
+lpr		gad	Pre-commit review requested, particularly for
+			lpd/recvjob.c and lpd/printjob.c.
+nanobsd		imp	Pre-commit phabricator review requested.
+net80211	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+nfs		freebsd-fs@FreeBSD.org, rmacklem is best for reviews.
+nis(8), yp(8)	araujo	Pre-commit review requested.
+nvd(4)		jimharris	Pre-commit review requested.
+nvme(4)		jimharris	Pre-commit review requested.
+nvmecontrol(8)	jimharris	Pre-commit review requested.
+opencrypto	jmg	Pre-commit review requested.  Documentation Required.
+openssh		des	Pre-commit review requested.
+openssl		benl,jkim	Pre-commit review requested.
+otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+pci bus		imp,jhb	Pre-commit review requested.
+pmcstudy(8)	rrs		Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+pseudofs	des	Pre-commit review requested.
+release/release.sh	gjb,re	Pre-commit review and regression tests
+				requested.
+sctp		rrs,tuexen	Pre-commit review requested (changes need to be backported to github).
+sendmail	gshapiro	Pre-commit review requested.
+sh(1)		jilles		Pre-commit review requested. This also applies
+				to kill(1), printf(1) and test(1) which are
+				compiled in as builtins.
+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.
-tests			freebsd-testing,ngie	Pre-commit review requested.
-sys/dev/usb	hselasky	If in doubt, ask.
-sys/dev/sound/usb	hselasky	If in doubt, ask.
 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.
 sys/dev/ixl	erj	Pre-commit phabricator review requested.
+sys/dev/sound/usb	hselasky	If in doubt, ask.
+sys/dev/usb	hselasky	If in doubt, ask.
 sys/netinet/ip_carp.c	glebius	Pre-commit review recommended.
 sys/netpfil/pf	kp,glebius	Pre-commit review recommended.
+tests			freebsd-testing,ngie	Pre-commit review requested.
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
-lpr		gad	Pre-commit review requested, particularly for
-			lpd/recvjob.c and lpd/printjob.c.
-nis(8), yp(8)	araujo	Pre-commit review requested.
----- OLD ----
-libc/posix1e	rwatson	Pre-commit review requested.
-POSIX.1e ACLs	rwatson	Pre-commit review requested.
-UFS EAs		rwatson	Pre-commit review requested.
-MAC Framework	rwatson	Pre-commit review requested.
-MAC Modules	rwatson	Pre-commit review requested.
-contrib/openbsm	rwatson	Pre-commit review requested.
-sys/security/audit	rwatson	Pre-commit review requested.
-ahc(4)		gibbs	Pre-commit review requested.
-ahd(4)		gibbs	Pre-commit review requested.
-pci bus		imp,jhb	Pre-commit review requested.
-cdboot		jhb	Pre-commit review requested.
-pxeboot		jhb	Pre-commit review requested.
-witness		jhb	Pre-commit review requested.
-CAM		gibbs,
-		ken	Pre-commit review requested. send to scsi@freebsd.org
-devstat(9)	ken	Pre-commit review requested.
-camcontrol(8)	ken	Pre-commit review requested.
-libcam		ken	Pre-commit review requested.
-libdevstat	ken	Pre-commit review requested.
-iostat(8)	ken	Pre-commit review requested.
-cd(4)		ken	Pre-commit review requested.
-pass(4)		ken	Pre-commit review requested.
-ch(4)		ken	Pre-commit review requested.
-em(4)		jfv	Pre-commit review requested.
-sendmail	gshapiro	Pre-commit review requested.
-etc/mail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
-etc/sendmail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
-nvi		peter	Try not to break it.
-libz		peter	Try not to break it.
-groff		ru	Recommends pre-commit review.
-ipfw		ipfw	Pre-commit review preferred. send to ipfw@freebsd.org
-drm		rnoland	Just keep me informed of changes, try not to break it.
-unifdef(1)	fanf	Pre-commit review requested.
-ntp         	roberto	Pre-commit review requested.
-inetd		dwmalone	Recommends pre-commit review.
-contrib/smbfs	bp	Open for in-tree committs. In case of functional
-			changes pre-commit review requested.
-file		obrien	Insists to keep file blocked from other's unapproved
-			commits
-contrib/bzip2	obrien	Pre-commit review required.
-geom		freebsd-geom@FreeBSD.org
-geom_concat	pjd	Pre-commit review preferred.
-geom_eli	pjd	Pre-commit review preferred.
-geom_gate	pjd	Pre-commit review preferred.
-geom_label	pjd	Pre-commit review preferred.
-geom_mirror	pjd	Pre-commit review preferred.
-geom_nop	pjd	Pre-commit review preferred.
-geom_raid3	pjd	Pre-commit review preferred.
-geom_shsec	pjd	Pre-commit review preferred.
-geom_stripe	pjd	Pre-commit review preferred.
-geom_zero	pjd	Pre-commit review preferred.
-sbin/geom	pjd	Pre-commit review preferred.
-zfs		freebsd-fs@FreeBSD.org
-nfs		freebsd-fs@FreeBSD.org, rmacklem is best for reviews.
-linux emul	emulation	Please discuss changes here.
-bs{diff,patch}	cperciva	Pre-commit review requested.
-portsnap	cperciva	Pre-commit review requested.
-freebsd-update	cperciva	Pre-commit review requested.
-sys/netgraph/bluetooth	emax	Pre-commit review preferred.
-lib/libbluetooth	emax	Pre-commit review preferred.
-lib/libsdp		emax	Pre-commit review preferred.
-usr.bin/bluetooth	emax	Pre-commit review preferred.
-usr.sbin/bluetooth	emax	Pre-commit review preferred.
-*env(3)		secteam	Due to the problematic security history of this
-			code, please have patches reviewed by secteam.
-share/zoneinfo		edwin	Heads-up appreciated, since our data is coming
-				from a third party source.
-usr.sbin/zic		edwin   Heads-up appreciated, since this code is
-				maintained by a third party source.
-lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
-				is maintained by a third party source.
-sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
-cmx		daniel@roe.ch	Pre-commit review preferred.
-filemon		obrien		Pre-commit review preferred.
-sysdoc		trhodes		Pre-commit review preferred.
-nanobsd		imp	Pre-commit review requested for coordination.
 vmm(4)		neel,grehan	Pre-commit review requested.

Modified: projects/vnet/Makefile
==============================================================================
--- projects/vnet/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -57,8 +57,8 @@
 # Makefile.inc1.  The exceptions are universe, tinderbox and targets.
 #
 # If you want to build your system from source be sure that /usr/obj has
-# at least 1GB of diskspace available.  A complete 'universe' build requires
-# about 15GB of space.
+# at least 6GB of diskspace available.  A complete 'universe' build requires
+# about 100GB of space.
 #
 # For individuals wanting to build from the sources currently on their
 # system, the simple instructions are:
@@ -180,7 +180,7 @@ _MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makef
 _TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}
 .endif
 .if defined(TARGET) && !defined(_TARGET)
 _TARGET=${TARGET}

Modified: projects/vnet/Makefile.inc1
==============================================================================
--- projects/vnet/Makefile.inc1	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/Makefile.inc1	Tue Dec 22 13:58:11 2015	(r292600)
@@ -48,10 +48,11 @@
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
+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)
-LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
@@ -146,7 +147,11 @@ CLEANDIR=	cleandir
 LOCAL_TOOL_DIRS?=
 PACKAGEDIR?=	${DESTDIR}/${DISTDIR}
 
+.if empty(SHELL:M*csh*)
 BUILDENV_SHELL?=${SHELL}
+.else
+BUILDENV_SHELL?=/bin/sh
+.endif
 
 SVN?=		/usr/local/bin/svn
 SVNFLAGS?=	-r HEAD
@@ -163,7 +168,7 @@ OSRELDATE=	0
 .endif
 
 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
-.if !defined(VERSION)
+.if !defined(VERSION) && !make(showconfig)
 REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
 BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
@@ -172,7 +177,25 @@ VERSION=	FreeBSD ${REVISION}-${BRANCH:C/
 .export VERSION
 .endif
 
-KNOWN_ARCHES?=	aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	aarch64/arm64 \
+		amd64 \
+		arm \
+		armeb/arm \
+		armv6/arm \
+		armv6hf/arm \
+		i386 \
+		i386/pc98 \
+		mips \
+		mipsel/mips \
+		mips64el/mips \
+		mips64/mips \
+		mipsn32el/mips \
+		mipsn32/mips \
+		powerpc \
+		powerpc64/powerpc \
+		riscv64/riscv \
+		sparc64
+
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -195,11 +218,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
+# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk.
+.if !make(showconfig)
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
+.endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
@@ -666,7 +692,7 @@ everything:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all
+	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
 .if defined(LIB32TMP)
 build32: .PHONY
 	@echo
@@ -1289,7 +1315,7 @@ packagekernel:
 # Build the API documentation with doxygen
 #
 doxygen: .PHONY
-	@if [ ! -x `/usr/bin/which doxygen` ]; then \
+	@if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi
@@ -2008,14 +2034,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from
-# 'everything' with _PARALLEL_SUBUDIR_OK set.  This is because it is unlikely
+# 'everything' with _PARALLEL_SUBDIR_OK set.  This is because it is unlikely
 # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE
 # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in
 # parallel.  This is safe for the world stage of buildworld though since it has
 # already built libraries in a proper order and installed includes into
 # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to
 # avoid trashing a system if it crashes mid-install.
-.if !make(all) || defined(_PARALLEL_SUBUDIR_OK)
+.if !make(all) || defined(_PARALLEL_SUBDIR_OK)
 SUBDIR_PARALLEL=
 .endif
 

Modified: projects/vnet/UPDATING
==============================================================================
--- projects/vnet/UPDATING	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/UPDATING	Tue Dec 22 13:58:11 2015	(r292600)
@@ -31,6 +31,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20151216:
+	The tftp loader (pxeboot) now uses the option root-path directive. As a
+	consequence it no longer looks for a pxeboot.4th file on the tftp
+	server. Instead it uses the regular /boot infrastructure as with the
+	other loaders.
+
+20151211:
+	The code to start recording plug and play data into the modules has
+	been committed. While the old tools will properly build a new kernel,
+	a number of warnings about "unknown metadata record 4" will be produced
+	for an older kldxref. To avoid such warnings, make sure to rebuild
+	the kernel toolchain (or world). Make sure that you have r292078 or
+	later when trying to build 292077 or later before rebuilding.
+
+20151207:
+	Debug data files are now built by default with 'make buildworld' and
+	installed with 'make installworld'. This facilitates debugging but
+	requires more disk space both during the build and for the installed
+	world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes
+	in src.conf(5).
+
 20151130:
 	r291527 changed the internal interface between the nfsd.ko and
 	nfscommon.ko modules. As such, they must both be upgraded to-gether.

Modified: projects/vnet/bin/ed/main.c
==============================================================================
--- projects/vnet/bin/ed/main.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/ed/main.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -505,7 +505,8 @@ exec_command(void)
 			return ERR;
 		else if (open_sbuf() < 0)
 			return FATAL;
-		if (*fnp && *fnp != '!') strcpy(old_filename, fnp);
+		if (*fnp && *fnp != '!')
+			 strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";
@@ -532,7 +533,8 @@ exec_command(void)
 			return ERR;
 		}
 		GET_COMMAND_SUFFIX();
-		if (*fnp) strcpy(old_filename, fnp);
+		if (*fnp)
+			strlcpy(old_filename, fnp, PATH_MAX);
 		printf("%s\n", strip_escapes(old_filename));
 		break;
 	case 'g':
@@ -663,7 +665,7 @@ exec_command(void)
 		GET_COMMAND_SUFFIX();
 		if (!isglobal) clear_undo_stack();
 		if (*old_filename == '\0' && *fnp != '!')
-			strcpy(old_filename, fnp);
+			strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";
@@ -797,7 +799,7 @@ exec_command(void)
 			return ERR;
 		GET_COMMAND_SUFFIX();
 		if (*old_filename == '\0' && *fnp != '!')
-			strcpy(old_filename, fnp);
+			strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";

Modified: projects/vnet/bin/freebsd-version/Makefile
==============================================================================
--- projects/vnet/bin/freebsd-version/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/freebsd-version/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -2,7 +2,7 @@
 
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1
-CLEANFILES = freebsd-version.sh
+CLEANFILES = freebsd-version freebsd-version.sh
 NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
 
 freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}

Modified: projects/vnet/bin/ls/print.c
==============================================================================
--- projects/vnet/bin/ls/print.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/ls/print.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$");
 #include <fts.h>
 #include <langinfo.h>
 #include <libutil.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <wchar.h>
 #ifdef COLORLS
 #include <ctype.h>
 #include <termcap.h>
@@ -105,6 +107,9 @@ static struct {
 } colors[C_NUMCOLORS];
 #endif
 
+static size_t padding_for_month[12];
+static size_t month_max_size = 0;
+
 void
 printscol(const DISPLAY *dp)
 {
@@ -138,6 +143,70 @@ printname(const char *field, const char 
 	return rc;
 }
 
+static const char *
+get_abmon(int mon)
+{
+
+	switch (mon) {
+	case 0: return (nl_langinfo(ABMON_1));
+	case 1: return (nl_langinfo(ABMON_2));
+	case 2: return (nl_langinfo(ABMON_3));
+	case 3: return (nl_langinfo(ABMON_4));
+	case 4: return (nl_langinfo(ABMON_5));
+	case 5: return (nl_langinfo(ABMON_6));
+	case 6: return (nl_langinfo(ABMON_7));
+	case 7: return (nl_langinfo(ABMON_8));
+	case 8: return (nl_langinfo(ABMON_9));
+	case 9: return (nl_langinfo(ABMON_10));
+	case 10: return (nl_langinfo(ABMON_11));
+	case 11: return (nl_langinfo(ABMON_12));
+	}
+
+	/* should never happen */
+	abort();
+}
+
+static size_t
+mbswidth(const char *month)
+{
+	wchar_t wc;
+	size_t width, donelen, clen, w;
+
+	width = donelen = 0;
+	while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) {
+		if (clen == (size_t)-1 || clen == (size_t)-2)
+			return (-1);
+		donelen += clen;
+		if ((w = wcwidth(wc)) == (size_t)-1)
+			return (-1);
+		width += w;
+	}
+
+	return (width);
+}
+
+static void
+compute_abbreviated_month_size(void)
+{
+	int i;
+	size_t width;
+	size_t months_width[12];
+
+	for (i = 0; i < 12; i++) {
+		width = mbswidth(get_abmon(i));
+		if (width == (size_t)-1) {
+			month_max_size = -1;
+			return;
+		}
+		months_width[i] = width;
+		if (width > month_max_size)
+			month_max_size = width;
+	}
+
+	for (i = 0; i < 12; i++)
+		padding_for_month[i] = month_max_size - months_width[i];
+}
+
 /*
  * print name in current style
  */
@@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev)
 	xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev);
 }
 
+static size_t
+ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm)
+{
+	char *posb, nfmt[BUFSIZ];
+	const char *format = fmt;
+	size_t ret;
+
+	if ((posb = strstr(fmt, "%b")) != NULL) {
+		if (month_max_size == 0) {
+			compute_abbreviated_month_size();
+		}
+		if (month_max_size > 0) {
+			snprintf(nfmt, sizeof(nfmt),  "%.*s%s%*s%s",
+			    (int)(posb - fmt), fmt,
+			    get_abmon(tm->tm_mon),
+			    (int)padding_for_month[tm->tm_mon],
+			    "",
+			    posb + 2);
+			format = nfmt;
+		}
+	}
+	ret = strftime(str, len, format, tm);
+	return (ret);
+}
+
 static void
 printtime(const char *field, time_t ftime)
 {
@@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim
 	else
 		/* mmm dd  yyyy || dd mmm  yyyy */
 		format = d_first ? "%e %b  %Y" : "%b %e  %Y";
-	strftime(longstring, sizeof(longstring), format, localtime(&ftime));
+	ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime));
 
 	snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);

Modified: projects/vnet/bin/ls/tests/ls_tests.sh
==============================================================================
--- projects/vnet/bin/ls/tests/ls_tests.sh	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/ls/tests/ls_tests.sh	Tue Dec 22 13:58:11 2015	(r292600)
@@ -170,8 +170,6 @@ B_flag_head()
 
 B_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B
 }
@@ -467,8 +465,6 @@ b_flag_head()
 
 b_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b
 }
@@ -747,8 +743,6 @@ q_flag_and_w_flag_head()
 
 q_flag_and_w_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	create_test_dir
 
 	test_file="$(printf "y\01z")"

Modified: projects/vnet/bin/sh/mknodes.c
==============================================================================
--- projects/vnet/bin/sh/mknodes.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/sh/mknodes.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -89,7 +89,6 @@ static struct str *nodestr[MAXTYPES];	/*
 static int nstr;			/* number of structures */
 static struct str str[MAXTYPES];	/* the structures */
 static struct str *curstr;		/* current structure */
-static FILE *infp;
 static char line[1024];
 static int linno;
 static char *linep;
@@ -102,7 +101,7 @@ static void outfunc(FILE *, int);
 static void indent(int, FILE *);
 static int nextfield(char *);
 static void skipbl(void);
-static int readline(void);
+static int readline(FILE *);
 static void error(const char *, ...) __printf0like(1, 2) __dead2;
 static char *savestr(const char *);
 
@@ -110,17 +109,19 @@ static char *savestr(const char *);
 int
 main(int argc, char *argv[])
 {
+	FILE *infp;
+
 	if (argc != 3)
 		error("usage: mknodes file");
-	infp = stdin;
 	if ((infp = fopen(argv[1], "r")) == NULL)
 		error("Can't open %s: %s", argv[1], strerror(errno));
-	while (readline()) {
+	while (readline(infp)) {
 		if (line[0] == ' ' || line[0] == '\t')
 			parsefield();
 		else if (line[0] != '\0')
 			parsenode();
 	}
+	fclose(infp);
 	output(argv[2]);
 	exit(0);
 }
@@ -253,6 +254,10 @@ output(char *file)
 	fputs("union node *getfuncnode(struct funcdef *);\n", hfile);
 	fputs("void reffunc(struct funcdef *);\n", hfile);
 	fputs("void unreffunc(struct funcdef *);\n", hfile);
+	if (ferror(hfile))
+		error("Can't write to nodes.h");
+	if (fclose(hfile))
+		error("Can't close nodes.h");
 
 	fputs(writer, cfile);
 	while (fgets(line, sizeof line, patfile) != NULL) {
@@ -266,6 +271,11 @@ output(char *file)
 		else
 			fputs(line, cfile);
 	}
+	fclose(patfile);
+	if (ferror(cfile))
+		error("Can't write to nodes.c");
+	if (fclose(cfile))
+		error("Can't close nodes.c");
 }
 
 
@@ -401,7 +411,7 @@ skipbl(void)
 
 
 static int
-readline(void)
+readline(FILE *infp)
 {
 	char *p;
 

Modified: projects/vnet/bin/sh/tests/parameters/Makefile
==============================================================================
--- projects/vnet/bin/sh/tests/parameters/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/sh/tests/parameters/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -20,6 +20,8 @@ FILES+=		positional4.0
 FILES+=		positional5.0
 FILES+=		positional6.0
 FILES+=		positional7.0
+FILES+=		positional8.0
+FILES+=		positional9.0
 FILES+=		pwd1.0
 FILES+=		pwd2.0
 

Copied: projects/vnet/bin/sh/tests/parameters/positional9.0 (from r292599, head/bin/sh/tests/parameters/positional9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/bin/sh/tests/parameters/positional9.0	Tue Dec 22 13:58:11 2015	(r292600, copy of r292599, head/bin/sh/tests/parameters/positional9.0)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified,
+# make sure it is at least numeric.
+
+set -- bb cc ddd
+set -f
+lengths=${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+IFS=
+lengths=$lengths${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+case $lengths in
+*[!0-9]*)
+	printf 'bad: %s\n' "$lengths"
+	exit 3 ;;
+????????????????*) ;;
+*)
+	printf 'too short: %s\n' "$lengths"
+	exit 3 ;;
+esac

Modified: projects/vnet/bin/sh/var.c
==============================================================================
--- projects/vnet/bin/sh/var.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/bin/sh/var.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -330,7 +330,7 @@ setvareq(char *s, int flags)
 		if (vp->flags & VREADONLY) {
 			if ((flags & (VTEXTFIXED|VSTACK)) == 0)
 				ckfree(s);
-			error("%.*s: is read only", vp->name_len, s);
+			error("%.*s: is read only", vp->name_len, vp->text);
 		}
 		if (flags & VNOSET) {
 			if ((flags & (VTEXTFIXED|VSTACK)) == 0)

Modified: projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Tue Dec 22 13:58:11 2015	(r292600)
@@ -1,2 +1,3 @@
 Sun, 25 Jan 2004 13:00:00 PST
 2004 Jan 25 13:00:00
+

Copied: projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh	Tue Dec 22 13:58:11 2015	(r292600, copy of r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
@@ -0,0 +1,99 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+#
+# This test assures that we can have the same provider name across multiple
+# probe definitions, and that the result will be the union of those
+# definitions.  In particular, libusdt depends on this when (for example)
+# node modules that create a provider are loaded multiple times due to
+# being included by different modules.
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in bagnoogle stalloogle cockoogle; do
+	cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+	DTRACE_PROBE(doogle, $oogle);
+}
+EOF
+
+	cat > $oogle.d <<EOF
+provider doogle {
+	probe $oogle();
+};
+EOF
+
+	cc -c $oogle.c
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to compile $oogle.c"
+		exit 1
+	fi
+
+	$dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to process $oogle.d"
+		exit 1
+	fi
+
+	objs="$objs $oogle.o $oogle.d.o"
+	echo $oogle'();' >> test.c
+done
+
+echo "}" >> test.c
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to compile test.c"
+	exit 1
+fi
+
+$dtrace -n 'doogle$target:::{@[probename] = count()}' \
+    -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to execute test"
+	exit 1
+fi
+
+cd /
+rm -rf $DIR
+exit 0

Copied: projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/vnet/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out	Tue Dec 22 13:58:11 2015	(r292600, copy of r292599, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
@@ -0,0 +1,4 @@
+bagnoogle  1
+cockoogle  1
+stalloogle 1
+

Modified: projects/vnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/vnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr
 	prsyminfo_t sip;
 	dof_helper_t dh;
 	GElf_Half e_type;
-#ifdef __FreeBSD__
-	dof_hdr_t hdr;
-	size_t sz;
-	uint64_t dofmax;
-	void *dof;
-#endif
 	const char *mname;
 	const char *syms[] = { "___SUNW_dof", "__SUNW_dof" };
 	int i, fd = -1;
@@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr
 			continue;
 		}
 
-#ifdef __FreeBSD__
+		dh.dofhp_dof = sym.st_value;
 		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-		if (Pread(P, &hdr, sizeof (hdr), sym.st_value) !=
-		    sizeof (hdr)) {
-			dt_dprintf("read of DOF header failed\n");
-			continue;
-		}
-
-		sz = sizeof(dofmax);
-		if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz,
-		    NULL, 0) != 0) {
-			dt_dprintf("failed to read dof_maxsize: %s\n",
-			    strerror(errno));
-			continue;
-		}
-		if (dofmax < hdr.dofh_loadsz) {
-			dt_dprintf("DOF load size exceeds maximum\n");
-			continue;
-		}
-
-		if ((dof = malloc(hdr.dofh_loadsz)) == NULL)
-			return (-1);
-
-		if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) !=
-		    hdr.dofh_loadsz) {
-			free(dof);
-			dt_dprintf("read of DOF section failed\n");
-			continue;
-		}
-
-		dh.dofhp_dof = (uintptr_t)dof;
-		dh.dofhp_pid = proc_getpid(P);
 
 		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
 		    sip.prs_lmid, mname);
 
+#ifdef __FreeBSD__
+		dh.dofhp_pid = proc_getpid(P);
+
 		if (fd == -1 &&
 		    (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("open of helper device failed: %s\n",
 			    strerror(errno));
-			free(dof);
 			return (-1); /* errno is set for us */
 		}
 
 		if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
 			dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
-
-		free(dof);
 #else
-		dh.dofhp_dof = sym.st_value;
-		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-
-		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
-		    sip.prs_lmid, mname);
-
 		if (fd == -1 &&
 		    (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("pr_open of helper device failed: %s\n",

Modified: projects/vnet/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- projects/vnet/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -24,6 +24,6 @@ CFILES= \
      tst.sigwait.c  \
 
 
-LIBADD.tst.sigwait.exe=rt
+LIBADD.tst.sigwait.exe+= rt
 
 .include "../../dtrace.test.mk"

Modified: projects/vnet/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- projects/vnet/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -46,6 +46,8 @@ TESTFILES= \
      tst.onlyenabled.ksh  \
      tst.reap.ksh  \
      tst.reeval.ksh  \
+     tst.sameprovmulti.ksh  \
+     tst.sameprovmulti.ksh.out  \
      tst.static.ksh  \
      tst.static.ksh.out  \
      tst.static2.ksh  \

Modified: projects/vnet/contrib/bmake/ChangeLog
==============================================================================
--- projects/vnet/contrib/bmake/ChangeLog	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/contrib/bmake/ChangeLog	Tue Dec 22 13:58:11 2015	(r292600)
@@ -1,3 +1,35 @@
+2015-12-01  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151201
+	  Merge with NetBSD make, pick up
+	  o cond.c: CondCvtArg: avoid access beyond end of empty buffer.
+	  o meta.c: meta_oodate: use lstat(2) for checking link target
+	    in case it is a symlink.
+	  o var.c: avoid calling brk_string and Var_Export1 with empty
+	    strings.
+	
+2015-11-26  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151126
+	  Merge with NetBSD make, pick up
+	  o parse.c: ParseTrackInput don't access beyond 
+	    end of old value.
+	
+2015-10-22  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151022
+
+	* Add support for BSD/OS which lacks inttypes.h
+	  and really needs sys/param.h for sys/sysctl.h
+	  also 'type' is not a shell builtin.
+
+	* var.c: eliminate uint32_t and need for inttypes.h
+	
+	* main.c: PrintOnError flush stdout before run .ERROR
+
+	* parse.c: cope with _SC_PAGESIZE not being defined.
+
+	
 2015-10-20  Simon J. Gerraty  <sjg@bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151020

Modified: projects/vnet/contrib/bmake/Makefile
==============================================================================
--- projects/vnet/contrib/bmake/Makefile	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/contrib/bmake/Makefile	Tue Dec 22 13:58:11 2015	(r292600)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.44 2015/10/20 21:41:40 sjg Exp $
+#	$Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151020
+MAKE_VERSION= 20151201
 
 PROG=	bmake
 

Modified: projects/vnet/contrib/bmake/boot-strap
==============================================================================
--- projects/vnet/contrib/bmake/boot-strap	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/contrib/bmake/boot-strap	Tue Dec 22 13:58:11 2015	(r292600)
@@ -111,7 +111,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: boot-strap,v 1.45 2014/04/05 22:56:54 sjg Exp $
+#	$Id: boot-strap,v 1.48 2015/10/25 05:20:48 sjg Exp $
 #
 #	@(#) Copyright (c) 2001 Simon J. Gerraty
 #
@@ -395,8 +395,15 @@ Bmake() {
     )
 }
 
+# there is actually a shell where type is not a builtin
+# if type is missing, which(1) had better exists!
+if (type cat) > /dev/null 2>&1; then
+which() {
+        type "$@" | sed 's,[()],,g;s,^[^/][^/]*,,;q'
+}
+fi
 # make sure test below uses the same diff that configure did
-TOOL_DIFF=`type diff | sed 's,[()],,g;s,^[^/][^/]*,,;q'`
+TOOL_DIFF=`which diff`
 export TOOL_DIFF
 
 op_configure() {

Modified: projects/vnet/contrib/bmake/cond.c
==============================================================================
--- projects/vnet/contrib/bmake/cond.c	Tue Dec 22 13:41:50 2015	(r292599)
+++ projects/vnet/contrib/bmake/cond.c	Tue Dec 22 13:58:11 2015	(r292600)
@@ -1,4 +1,4 @@
-/*	$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
 #else
-__RCSID("$NetBSD: cond.c,v 1.69 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: cond.c,v 1.71 2015/12/02 00:28:24 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -490,6 +490,10 @@ CondCvtArg(char *str, double *value)
     double d_val;

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

From owner-svn-src-projects@freebsd.org  Tue Dec 22 20:03:50 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77C16A4E290
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 22 Dec 2015 20:03:50 +0000 (UTC) (envelope-from np@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 mx1.freebsd.org (Postfix) with ESMTPS id 4B5351BEE;
 Tue, 22 Dec 2015 20:03:50 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMK3n4X035879;
 Tue, 22 Dec 2015 20:03:49 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMK3n7R035878;
 Tue, 22 Dec 2015 20:03:49 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201512222003.tBMK3n7R035878@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Tue, 22 Dec 2015 20:03:49 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292618 - projects/cxl_iscsi/sys/dev/iscsi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2015 20:03:50 -0000

Author: np
Date: Tue Dec 22 20:03:49 2015
New Revision: 292618
URL: https://svnweb.freebsd.org/changeset/base/292618

Log:
  Add comment to go with r291228.
  
  Submitted by:	trasz@

Modified:
  projects/cxl_iscsi/sys/dev/iscsi/iscsi.c

Modified: projects/cxl_iscsi/sys/dev/iscsi/iscsi.c
==============================================================================
--- projects/cxl_iscsi/sys/dev/iscsi/iscsi.c	Tue Dec 22 19:41:40 2015	(r292617)
+++ projects/cxl_iscsi/sys/dev/iscsi/iscsi.c	Tue Dec 22 20:03:49 2015	(r292618)
@@ -1371,6 +1371,11 @@ iscsi_ioctl_daemon_handoff(struct iscsi_
 	is->is_statsn = handoff->idh_statsn;
 	is->is_initial_r2t = handoff->idh_initial_r2t;
 	is->is_immediate_data = handoff->idh_immediate_data;
+
+	/*
+	 * Cap MaxRecvDataSegmentLength obtained from the target to the maximum
+	 * size supported by our ICL module.
+	 */
 	is->is_max_data_segment_length = min(ic->ic_max_data_segment_length,
 	    handoff->idh_max_data_segment_length);
 	is->is_max_burst_length = handoff->idh_max_burst_length;

From owner-svn-src-projects@freebsd.org  Tue Dec 22 22:32:20 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id BBC7CA507A5
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Tue, 22 Dec 2015 22:32:20 +0000 (UTC)
 (envelope-from glebius@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 mx1.freebsd.org (Postfix) with ESMTPS id 8BD8B1327;
 Tue, 22 Dec 2015 22:32:20 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBMMWJpR079523;
 Tue, 22 Dec 2015 22:32:19 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBMMWJh3079522;
 Tue, 22 Dec 2015 22:32:19 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201512222232.tBMMWJh3079522@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 22 Dec 2015 22:32:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292628 - projects/sendfile/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Dec 2015 22:32:20 -0000

Author: glebius
Date: Tue Dec 22 22:32:19 2015
New Revision: 292628
URL: https://svnweb.freebsd.org/changeset/base/292628

Log:
  Utilize new vm_page_unwire() KPI.

Modified:
  projects/sendfile/sys/kern/uipc_syscalls.c

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Tue Dec 22 21:26:50 2015	(r292627)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Tue Dec 22 22:32:19 2015	(r292628)
@@ -1849,13 +1849,12 @@ sf_ext_free(void *arg1, void *arg2)
 	sf_buf_free(sf);
 
 	vm_page_lock(pg);
-	vm_page_unwire(pg, PQ_INACTIVE);
 	/*
 	 * Check for the object going away on us. This can
 	 * happen since we don't hold a reference to it.
 	 * If so, we're responsible for freeing the page.
 	 */
-	if (pg->wire_count == 0 && pg->object == NULL)
+	if (vm_page_unwire(pg, PQ_INACTIVE) && pg->object == NULL)
 		vm_page_free(pg);
 	vm_page_unlock(pg);
 
@@ -1882,10 +1881,10 @@ sf_ext_free_nocache(void *arg1, void *ar
 	sf_buf_free(sf);
 
 	vm_page_lock(pg);
-	vm_page_unwire(pg, 0);
-	if (pg->wire_count == 0) {
+	if (vm_page_unwire(pg, PQ_NONE)) {
 		vm_object_t obj;
 
+		/* Try to free the page, but only if it is cheap to. */
 		if ((obj = pg->object) == NULL)
 			vm_page_free(pg);
 		else if (!vm_page_xbusied(pg) && VM_OBJECT_TRYWLOCK(obj)) {

From owner-svn-src-projects@freebsd.org  Wed Dec 23 00:42:13 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C185A4E050
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 00:42:13 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: from mail-oi0-x230.google.com (mail-oi0-x230.google.com
 [IPv6:2607:f8b0:4003:c06::230])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id DB75F1AB6;
 Wed, 23 Dec 2015 00:42:12 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: by mail-oi0-x230.google.com with SMTP id l9so88035871oia.2;
 Tue, 22 Dec 2015 16:42:12 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=uXSV1yRyeHJZkKbi1VnVEt5e2ZcC8sonyskjw6rMiMw=;
 b=Vkbiki9L43VqMYpI3AvFkNoNZKeQ9AYtBR1IbAnGdiNHm8DVoAOIi/DwrzmfGg5H19
 MMsQaKxU0jxdLEE88EOM0RS77NS0rOLlEihE2IBD2YNl4jGOk4FKJO3MnyiGwLJoLQ5z
 ScvUVkFelaaLI0vS/KHKqIdI0ep2MK6rQ/ndaY3L4PyOY/6n2mWl1aUhNUQOhCirVJZU
 T/pifztHDjg09z1Q5xzgm72fn9dab1rL5PeslswSjPWs2oIvgmxRXVUxwIrp85r8PFhj
 3nszBAGxRXio6Xk6uplpn4c1nVjvsBIbnDUwycOuK40T/0qko3q9z8ojK/nvj4bDgyLg
 km7g==
MIME-Version: 1.0
X-Received: by 10.202.178.135 with SMTP id b129mr10818138oif.86.1450831332244; 
 Tue, 22 Dec 2015 16:42:12 -0800 (PST)
Sender: asomers@gmail.com
Received: by 10.202.69.84 with HTTP; Tue, 22 Dec 2015 16:42:12 -0800 (PST)
In-Reply-To: <201510211143.t9LBhZTe042758@repo.freebsd.org>
References: <201510211143.t9LBhZTe042758@repo.freebsd.org>
Date: Tue, 22 Dec 2015 17:42:12 -0700
X-Google-Sender-Auth: _X7uVvLhjz9gRmWjyAbQ81U3o1o
Message-ID: <CAOtMX2ifc2GWgrycx_WrDzR84-dBDA-cvp7J=-sJGWxYthsC7Q@mail.gmail.com>
Subject: Re: svn commit: r289688 - in projects/zfsd/head: . bin bin/cat
 bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date
 bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin...
From: Alan Somers <asomers@freebsd.org>
To: Baptiste Daroussin <bapt@freebsd.org>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
 svn-src-projects@freebsd.org
Content-Type: text/plain; charset=UTF-8
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 00:42:13 -0000

On Wed, Oct 21, 2015 at 5:43 AM, Baptiste Daroussin <bapt@freebsd.org> wrote:
> Author: bapt
> Date: Wed Oct 21 11:43:18 2015
> New Revision: 289688
> URL: https://svnweb.freebsd.org/changeset/base/289688
>
> Log:
>   Merge from head@289683
>
>   Sponsored by: Gandi.net
>

This change removed all of the ZFS test suite stuff from
etc/mtree/BSD.tests.dist.  Was that intentional, or just a mismerge?

From owner-svn-src-projects@freebsd.org  Wed Dec 23 07:01:12 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 471B4A50148
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 07:01:12 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: from mail-wm0-x22c.google.com (mail-wm0-x22c.google.com
 [IPv6:2a00:1450:400c:c09::22c])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id E7C391563;
 Wed, 23 Dec 2015 07:01:11 +0000 (UTC)
 (envelope-from baptiste.daroussin@gmail.com)
Received: by mail-wm0-x22c.google.com with SMTP id l126so137933575wml.1;
 Tue, 22 Dec 2015 23:01:11 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=sender:date:from:to:cc:subject:message-id:references:mime-version
 :content-type:content-disposition:in-reply-to:user-agent;
 bh=eghyvRGbZZ24cVEaqqQaWskrFnsIUfk8lI7zqu1zFgY=;
 b=b/piWgTAmcxjWYJe/cNoHSysDOHCR/pY2uCckKV8pT4uSoYn/Mh9oS9mNZmym+fJpi
 BoyUbrMf7QiKxome3o5DePwnuIRcNrZ3SC6iIA4KrpJEHGoPrvc8XPfZ+pakR8LqKZYa
 xYN1rntMI4bdXwyNhNoF970/l1UdRCOwaXTKnORzX0WfpMSsgfSws8EKfEswCyXTVLXq
 OYpgpVe1yK5zQh9CF9pHDtRiMCfcZPe4CvUj0U9/6ouFeUc0iEHesSlBl4F0UuqFVwj3
 PmD4ykqXQ5PvEp0xJkDJepWkimbFGmwgm/r3zLatSF3W0Wym5zIF5PuI76IHebFUrTZB
 rBJA==
X-Received: by 10.28.3.131 with SMTP id 125mr30308952wmd.64.1450854070451;
 Tue, 22 Dec 2015 23:01:10 -0800 (PST)
Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1])
 by smtp.gmail.com with ESMTPSA id cs4sm36175931wjc.10.2015.12.22.23.01.09
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 22 Dec 2015 23:01:09 -0800 (PST)
Sender: Baptiste Daroussin <baptiste.daroussin@gmail.com>
Date: Wed, 23 Dec 2015 08:01:07 +0100
From: Baptiste Daroussin <bapt@freebsd.org>
To: Alan Somers <asomers@freebsd.org>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
 svn-src-projects@freebsd.org
Subject: Re: svn commit: r289688 - in projects/zfsd/head: . bin bin/cat
 bin/cat/tests bin/chflags bin/chio bin/chmod bin/cp bin/csh bin/date
 bin/date/tests bin/dd bin/dd/tests bin/df bin/domainname bin/echo bin...
Message-ID: <20151223070107.GA20454@ivaldir.etoilebsd.net>
References: <201510211143.t9LBhZTe042758@repo.freebsd.org>
 <CAOtMX2ifc2GWgrycx_WrDzR84-dBDA-cvp7J=-sJGWxYthsC7Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="pf9I7BMVVzbSWLtt"
Content-Disposition: inline
In-Reply-To: <CAOtMX2ifc2GWgrycx_WrDzR84-dBDA-cvp7J=-sJGWxYthsC7Q@mail.gmail.com>
User-Agent: Mutt/1.5.24 (2015-08-30)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 07:01:12 -0000


--pf9I7BMVVzbSWLtt
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Tue, Dec 22, 2015 at 05:42:12PM -0700, Alan Somers wrote:
> On Wed, Oct 21, 2015 at 5:43 AM, Baptiste Daroussin <bapt@freebsd.org> wr=
ote:
> > Author: bapt
> > Date: Wed Oct 21 11:43:18 2015
> > New Revision: 289688
> > URL: https://svnweb.freebsd.org/changeset/base/289688
> >
> > Log:
> >   Merge from head@289683
> >
> >   Sponsored by: Gandi.net
> >
>=20
> This change removed all of the ZFS test suite stuff from
> etc/mtree/BSD.tests.dist.  Was that intentional, or just a mismerge?

A mismerge sorry

Best regards
Bapt

--pf9I7BMVVzbSWLtt
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCAAGBQJWekazAAoJEGOJi9zxtz5aYMcQAJUpn0JYb1zELFzaR9iYyIFD
kyDitiXwpf6rbSgohN8KQuxX4rIXfd58m6voIkbkBjQOVsTN7ZmqbJke6B62c8Rp
jUDaSaErQdhpZgi8opXFTX80DlhofIX/WbEonEbpedBlCyn6qO0N1uKlh87VXLNr
2xt2xyxrQkiOYPu1IF2+6WvafwtxDMT2evBlJ1olvpKQyd1V0xj57jlyrmhO2RF9
ujTJToQRN1nsjgwEhqnrqY+tIeOQPMefs6WBbhkgnhNW0sixSU7aQufsIodG/+eN
9B5/ZceOOGwbLo5kf9b+M/mFp5ZS3vMfp8X85AXoDncTCJ1Zw8KQohtPcC2Qkj8Q
h/VOzc2asOyYaRhUC7JMPLhKvLnjmSJjy37b2ZheYNYlXCtdtSr2131MOwIKTTZw
1xDY4JTiGQPTm7soyD3Jm0f2lzge0YNL7EOTMEDBxsUDVqfKvJVBU9VShl8cXEki
lYVnDMLz1PfexSf/a9Gvye0zeSPjpOXjWscluYqOlwsHswLVugiKf4vP/PCp7/0e
ltI0TBHrQujk6CstoGLwHF1qaqEtU+gPGgRbWNmqnMWt3kEuSx49cJspDaMaQqx2
jMcCPsBpfoIaGQBzsu4E0gopeD1Zw68iyLzWEN87vFRBouO1BouDmPT9K7zjyj6R
W3X3VBgjVPfacV3nrZsP
=6szx
-----END PGP SIGNATURE-----

--pf9I7BMVVzbSWLtt--

From owner-svn-src-projects@freebsd.org  Wed Dec 23 20:25:03 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13064A4F8FB
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 20:25:03 +0000 (UTC)
 (envelope-from asomers@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 mx1.freebsd.org (Postfix) with ESMTPS id C524F1F96;
 Wed, 23 Dec 2015 20:25:02 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKP1V7063637;
 Wed, 23 Dec 2015 20:25:01 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKP1Tr063635;
 Wed, 23 Dec 2015 20:25:01 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201512232025.tBNKP1Tr063635@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 23 Dec 2015 20:25:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292666 - in projects/zfsd/head: etc/mtree share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 20:25:03 -0000

Author: asomers
Date: Wed Dec 23 20:25:01 2015
New Revision: 292666
URL: https://svnweb.freebsd.org/changeset/base/292666

Log:
  Restore content accidentally reverted by r289683
  
  etc/mtree/BSD.tests.dist
  	Restore directory entries for the ZFS, zfsd, dtrace, and geom_part
  	tests.
  
  share/mk/atf.test.mk
  	Restore stuff related to the ATF_TESTS_KSH93 variable
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/etc/mtree/BSD.tests.dist
  projects/zfsd/head/share/mk/atf.test.mk

Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist
==============================================================================
--- projects/zfsd/head/etc/mtree/BSD.tests.dist	Wed Dec 23 18:48:32 2015	(r292665)
+++ projects/zfsd/head/etc/mtree/BSD.tests.dist	Wed Dec 23 20:25:01 2015	(r292666)
@@ -49,6 +49,8 @@
         lib
         ..
         sbin
+            zfsd
+            ..
         ..
         usr.bin
         ..
@@ -368,10 +370,286 @@
         ..
         aio
         ..
+        cddl
+            zfs
+                bin
+                ..
+                include
+                ..
+                tests
+                    acl
+                        cifs
+                        ..
+                        nontrivial
+                        ..
+                        trivial
+                        ..
+                    ..
+                    atime
+                    ..
+                    bootfs
+                    ..
+                    cache
+                    ..
+                    cachefile
+                    ..
+                    clean_mirror
+                        assertion_001
+                        ..
+                        assertion_002
+                        ..
+                        assertion_003
+                        ..
+                        assertion_004
+                        ..
+                    ..
+                    cli_root
+                        zfs_upgrade
+                        ..
+                        zfs_promote
+                        ..
+                        zfs_clone
+                        ..
+                        zfs_property
+                        ..
+                        zfs_destroy
+                        ..
+                        zpool_create
+                        ..
+                        zpool_history
+                        ..
+                        zpool_expand
+                        ..
+                        zpool_remove
+                        ..
+                        zfs_mount
+                        ..
+                        zfs_unshare
+                        ..
+                        zdb
+                        ..
+                        zpool_online
+                        ..
+                        zpool_get
+                        ..
+                        zpool_export
+                        ..
+                        zfs_copies
+                        ..
+                        zfs_get
+                        ..
+                        zfs
+                        ..
+                        zpool_clear
+                        ..
+                        zpool_import
+                        ..
+                        zpool
+                        ..
+                        zpool_offline
+                        ..
+                        zpool_replace
+                        ..
+                        zfs_rollback
+                        ..
+                        zpool_set
+                        ..
+                        zfs_send
+                        ..
+                        zfs_set
+                        ..
+                        zpool_detach
+                        ..
+                        zpool_scrub
+                        ..
+                        zfs_inherit
+                        ..
+                        zfs_snapshot
+                        ..
+                        zfs_share
+                        ..
+                        zpool_destroy
+                        ..
+                        zpool_status
+                        ..
+                        zfs_unmount
+                        ..
+                        zfs_receive
+                        ..
+                        zfs_create
+                        ..
+                        zpool_upgrade
+                            blockfiles
+                            ..
+                        ..
+                        zpool_add
+                        ..
+                        zfs_rename
+                        ..
+                        zpool_attach
+                        ..
+                        zfs_reservation
+                        ..
+                    ..
+                    cli_user
+                        misc
+                        ..
+                        zfs_list
+                        ..
+                        zpool_iostat
+                        ..
+                        zpool_list
+                        ..
+                    ..
+                    compression
+                    ..
+                    ctime
+                    ..
+                    delegate
+                        zfs_allow
+                        ..
+                        zfs_unallow
+                        ..
+                    ..
+                    devices
+                    ..
+                    exec
+                    ..
+                    grow_pool
+                    ..
+                    grow_replicas
+                    ..
+                    history
+                    ..
+                    hotplug
+                    ..
+                    hotspare
+                    ..
+                    inheritance
+                    ..
+                    interop
+                    ..
+                    inuse
+                    ..
+                    iscsi
+                    ..
+                    large_files
+                    ..
+                    largest_pool
+                    ..
+                    link_count
+                    ..
+                    mdb
+                    ..
+                    migration
+                    ..
+                    mmap
+                        mmap_read
+                        ..
+                        mmap_write
+                        ..
+                    ..
+                    mount
+                    ..
+                    mv_files
+                    ..
+                    nestedfs
+                    ..
+                    no_space
+                    ..
+                    online_offline
+                    ..
+                    pool_names
+                    ..
+                    poolversion
+                    ..
+                    privilege
+                    ..
+                    quota
+                    ..
+                    redundancy
+                    ..
+                    refquota
+                    ..
+                    refreserv
+                    ..
+                    remote
+                        cross_endian
+                        ..
+                        rebooting
+                        ..
+                        sharing
+                        ..
+                    ..
+                    rename_dirs
+                    ..
+                    replacement
+                    ..
+                    reservation
+                    ..
+                    rootpool
+                    ..
+                    rsend
+                    ..
+                    sas_phy_thrash
+                    ..
+                    scrub_mirror
+                    ..
+                    slog
+                    ..
+                    snapshot
+                    ..
+                    snapused
+                    ..
+                    sparse
+                    ..
+                    threadsappend
+                    ..
+                    truncate
+                    ..
+                    txg_integrity
+                    ..
+                    userquota
+                    ..
+                    utils_test
+                    ..
+                    write_dirs
+                    ..
+                    xattr
+                    ..
+                    zfsd
+                    ..
+                    zil
+                    ..
+                    zinject
+                    ..
+                    zones
+                    ..
+                    zvol
+                        zvol_ENOSPC
+                        ..
+                        zvol_cli
+                        ..
+                        zvol_misc
+                        ..
+                        zvol_swap
+                        ..
+                    ..
+                    zvol_thrash
+                    ..
+                ..
+            ..
+        ..
+        dtrace
+        ..
         fifo
         ..
         file
         ..
+        geom
+            geom_part
+            ..
+        ..
         kern
             acct
             ..
@@ -384,6 +662,8 @@
         ..
         mqueue
         ..
+        net
+        ..
         netinet
         ..
         opencrypto

Modified: projects/zfsd/head/share/mk/atf.test.mk
==============================================================================
--- projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 18:48:32 2015	(r292665)
+++ projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 20:25:01 2015	(r292666)
@@ -21,6 +21,7 @@
 ATF_TESTS_C?=
 ATF_TESTS_CXX?=
 ATF_TESTS_SH?=
+ATF_TESTS_KSH93?=
 
 .if !empty(ATF_TESTS_C)
 PROGS+= ${ATF_TESTS_C}
@@ -80,3 +81,28 @@ ${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 	mv ${.TARGET}.tmp ${.TARGET}
 .endfor
 .endif
+
+.if !empty(ATF_TESTS_KSH93)
+SCRIPTS+= ${ATF_TESTS_KSH93}
+_TESTS+= ${ATF_TESTS_KSH93}
+.for _T in ${ATF_TESTS_KSH93}
+SCRIPTSDIR_${_T}= ${TESTSDIR}
+TEST_INTERFACE.${_T}= atf
+CLEANFILES+= ${_T} ${_T}.tmp
+# TODO(jmmv): It seems to me that this SED and SRC functionality should
+# exist in bsd.prog.mk along the support for SCRIPTS.  Move it there if
+# this proves to be useful within the tests.
+ATF_TESTS_KSH93_SED_${_T}?= # empty
+ATF_TESTS_KSH93_SRC_${_T}?= ${_T}.sh
+${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
+	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
+.if empty(ATF_TESTS_KSH93_SED_${_T})
+	cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
+.else
+	cat ${.ALLSRC:N*Makefile*} \
+	    | sed ${ATF_TESTS_KSH93_SED_${_T}} >>${.TARGET}.tmp
+.endif
+	chmod +x ${.TARGET}.tmp
+	mv ${.TARGET}.tmp ${.TARGET}
+.endfor
+.endif

From owner-svn-src-projects@freebsd.org  Wed Dec 23 20:27:25 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 24F45A4F96B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 20:27:25 +0000 (UTC)
 (envelope-from asomers@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 mx1.freebsd.org (Postfix) with ESMTPS id EC29610FA;
 Wed, 23 Dec 2015 20:27:24 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNKROrJ063754;
 Wed, 23 Dec 2015 20:27:24 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNKRN2e063748;
 Wed, 23 Dec 2015 20:27:23 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201512232027.tBNKRN2e063748@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 23 Dec 2015 20:27:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292667 - in projects/zfsd/head/tests/sys/cddl/zfs: bin
 include tests/cli_root/zpool_import tests/cli_user/misc tests/threadsappend
 tests/txg_integrity
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 20:27:25 -0000

Author: asomers
Date: Wed Dec 23 20:27:23 2015
New Revision: 292667
URL: https://svnweb.freebsd.org/changeset/base/292667

Log:
  Fix build after recent merges into the zfsd branch
  
  cddl/zfs/include/testenv.kshlib
  cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib
  cddl/zfs/tests/cli_user/misc/setup_basic.ksh
  	Add missing files
  
  cddl/zfs/bin/Makefile
  cddl/zfs/tests/threadsappend/Makefile
  cddl/zfs/tests/txg_integrity/Makefile
  	s/LDADD/LIBADD
  
  Sponsored by:	Spectra Logic Corp

Added:
  projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib
  projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/setup_basic.ksh
Modified:
  projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
  projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile
  projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile

Modified: projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile	Wed Dec 23 20:25:01 2015	(r292666)
+++ projects/zfsd/head/tests/sys/cddl/zfs/bin/Makefile	Wed Dec 23 20:27:23 2015	(r292667)
@@ -54,7 +54,7 @@ PROGS+=		rm_lnkcnt_zero_file
 SRCS.$p=	$p.c
 .endfor
 
-LDADD.mmapwrite+=	-lpthread
-LDADD.rm_lnkcnt_zero_file+=	-lpthread
+LIBADD.mmapwrite+=	pthread
+LIBADD.rm_lnkcnt_zero_file+=	pthread
 
 .include <bsd.progs.mk>

Added: projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/include/testenv.kshlib	Wed Dec 23 20:27:23 2015	(r292667)
@@ -0,0 +1,19 @@
+. ${STF_SUITE}/include/libtest.kshlib
+. ${STF_SUITE}/include/commands.cfg
+
+# Environment-dependent constants.
+for d in `geom disk list | awk '/Name:/ {print $3}'`; do
+	# Clear the GPT label first to avoid spurious create failures.
+	gpart destroy -F $d >/dev/null 2>&1
+	if gpart create -s gpt $d >/dev/null 2>&1 ; then
+		gpart destroy $d >/dev/null 2>&1 || continue
+		DISKS=("${DISKS[@]}" "/dev/$d") #"$DISKS $d"
+	fi
+	# Don't bother testing any more if we have enough already.
+	# Currently we use at most 5 disks plus 1 for temporary disks.
+	[ ${#DISKS[@]} -eq 6 ] && break
+done
+export KEEP="$(zpool list -H -o name)"
+
+# Pull in constants.
+. ${STF_SUITE}/include/constants.cfg

Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import.kshlib	Wed Dec 23 20:27:23 2015	(r292667)
@@ -0,0 +1,32 @@
+# Common routines used by zpool_import*.
+
+function setup_missing_test_pool # <tvd_type>
+{
+	typeset tvd_type=$1
+
+	setup_filesystem "$DEVICE_FILES" $TESTPOOL1 $TESTFS $TESTDIR1 \
+		"" $tvd_type
+	log_must $CP $MYTESTFILE $TESTDIR1/$TESTFILE0
+	log_must $ZPOOL export $TESTPOOL1
+}
+
+function recreate_missing_files
+{
+	destroy_pool $TESTPOOL1
+	log_must $RM -rf $DEVICE_DIR/*
+	for (( devnum=0 ; $devnum < $MAX_NUM ; devnum += 1 )); do
+		log_must create_vdevs ${DEVICE_DIR}/${DEVICE_FILE}$devnum
+	done
+}
+
+function cleanup_missing
+{
+	log_note "State of pools at the end of the test:"
+	poolexists $TESTPOOL1 && log_must $ZPOOL status $TESTPOOL1
+	log_note "State of $DEVICE_DIR at the end of the test:"
+	log_cmd $ZPOOL import -d $DEVICE_DIR
+	destroy_pool $TESTPOOL1
+	log_must $RM -rf $DEVICE_DIR/*
+	[[ -d $ALTER_ROOT ]] && log_must $RM -rf $ALTER_ROOT
+	[[ -d $BACKUP_DEVICE_DIR ]] && log_must $RM -rf $BACKUP_DEVICE_DIR
+}

Added: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/setup_basic.ksh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_user/misc/setup_basic.ksh	Wed Dec 23 20:27:23 2015	(r292667)
@@ -0,0 +1,30 @@
+#!/usr/local/bin/ksh93 -p
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+# Copyright 2015 Spectra Logic Corporation.  All rights reserved.
+# Use is subject to license terms.
+
+. $STF_SUITE/include/libtest.kshlib
+
+# Allow unprivileged user to touch log files in our temp dir
+chmod 1777 ${TMPDIR}
+chmod 666 ${TMPDIR}/* || true

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile	Wed Dec 23 20:25:01 2015	(r292666)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/threadsappend/Makefile	Wed Dec 23 20:27:23 2015	(r292667)
@@ -13,7 +13,7 @@ FILES+=	threadsappend_001_pos.ksh
 FILES+=	threadsappend.cfg
 FILES+=	setup.ksh
 PROG+=	threadsappend
-LDADD+=	-lpthread
+LIBADD+=	pthread
 MAN=
 
 .include <bsd.test.mk>

Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile
==============================================================================
--- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile	Wed Dec 23 20:25:01 2015	(r292666)
+++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/Makefile	Wed Dec 23 20:27:23 2015	(r292667)
@@ -15,7 +15,7 @@ FILES+=	cleanup.ksh
 FILES+=	txg_integrity.cfg
 PROGS+=	txg_integrity
 PROGS+=	fsync_integrity
-LDADD+=	-lpthread
+LIBADD+=	pthread
 
 SRCS.fsync_integrity=	fsync_integrity.c
 SRCS.txg_integrity=	txg_integrity.c

From owner-svn-src-projects@freebsd.org  Wed Dec 23 23:35:34 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1CF86A5076A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 23 Dec 2015 23:35:34 +0000 (UTC)
 (envelope-from asomers@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 mx1.freebsd.org (Postfix) with ESMTPS id E4BD310CA;
 Wed, 23 Dec 2015 23:35:33 +0000 (UTC)
 (envelope-from asomers@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBNNZX7Q019878;
 Wed, 23 Dec 2015 23:35:33 GMT (envelope-from asomers@FreeBSD.org)
Received: (from asomers@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBNNZXra019877;
 Wed, 23 Dec 2015 23:35:33 GMT (envelope-from asomers@FreeBSD.org)
Message-Id: <201512232335.tBNNZXra019877@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: asomers set sender to
 asomers@FreeBSD.org using -f
From: Alan Somers <asomers@FreeBSD.org>
Date: Wed, 23 Dec 2015 23:35:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292675 - projects/zfsd/head/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2015 23:35:34 -0000

Author: asomers
Date: Wed Dec 23 23:35:32 2015
New Revision: 292675
URL: https://svnweb.freebsd.org/changeset/base/292675

Log:
  Fix typo from r292666
  
  Sponsored by:	Spectra Logic Corp

Modified:
  projects/zfsd/head/share/mk/atf.test.mk

Modified: projects/zfsd/head/share/mk/atf.test.mk
==============================================================================
--- projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 22:45:17 2015	(r292674)
+++ projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 23:35:32 2015	(r292675)
@@ -95,7 +95,7 @@ CLEANFILES+= ${_T} ${_T}.tmp
 ATF_TESTS_KSH93_SED_${_T}?= # empty
 ATF_TESTS_KSH93_SRC_${_T}?= ${_T}.sh
 ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
-	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
+	echo '#! /usr/libexec/atf-ksh93' > ${.TARGET}.tmp
 .if empty(ATF_TESTS_KSH93_SED_${_T})
 	cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
 .else

From owner-svn-src-projects@freebsd.org  Thu Dec 24 00:02:05 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB124A5025D
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 24 Dec 2015 00:02:05 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com
 [IPv6:2607:f8b0:400e:c03::234])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CC0951EBA;
 Thu, 24 Dec 2015 00:02:05 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: by mail-pa0-x234.google.com with SMTP id cy9so57508511pac.0;
 Wed, 23 Dec 2015 16:02:05 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=content-type:mime-version:subject:from:in-reply-to:date:cc
 :content-transfer-encoding:message-id:references:to;
 bh=ZxsTfC98Z5yq+DbSR4wA/CfzVS0wVWTp6dmE/Xg46Y0=;
 b=bRTsqLCXOgyEfgF2FEodho1tKTV0pg2LJ7QQa7vgYDeVixYgY4BqC8NzUv4ccU3nQb
 ju1aoOIylkCTJrz7lG52SRUoYMoXXamJqhl9vAXn5+nQsKrBZgLFE+3b9xFgXAylwZ7/
 bp1sQC6XwG/57/DXtcwF4ZRfJzlERgyFOjvfopmkx4jrTh3oQZygP7DsWdb70/J3G4St
 Z5k2/hxQKp2L5OeXOyR9PYa3jy8ZTpBhMh3n0F6W4wvLeIjQK3XeR4BYF1TgnIXl+FC6
 PDiGew3RlQm8e8UBf6u3PGxUp1Kra0KEWF2spezxJtb/3SUpHBQM755zB9GSbWKQFfw9
 OwtA==
X-Received: by 10.66.227.35 with SMTP id rx3mr47934361pac.3.1450915325148;
 Wed, 23 Dec 2015 16:02:05 -0800 (PST)
Received: from ?IPv6:2601:601:800:126d:6572:283a:84b7:ac98?
 ([2601:601:800:126d:6572:283a:84b7:ac98])
 by smtp.gmail.com with ESMTPSA id 21sm50190694pfs.42.2015.12.23.16.02.03
 (version=TLSv1/SSLv3 cipher=OTHER);
 Wed, 23 Dec 2015 16:02:03 -0800 (PST)
Content-Type: text/plain; charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2104\))
Subject: Re: svn commit: r292675 - projects/zfsd/head/share/mk
From: NGie Cooper <yaneurabeya@gmail.com>
In-Reply-To: <201512232335.tBNNZXra019877@repo.freebsd.org>
Date: Wed, 23 Dec 2015 16:02:01 -0800
Cc: src-committers@freebsd.org,
 svn-src-projects@freebsd.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <C47C4598-67DF-4DED-BFF4-BDFC460A7AD6@gmail.com>
References: <201512232335.tBNNZXra019877@repo.freebsd.org>
To: Alan Somers <asomers@FreeBSD.org>
X-Mailer: Apple Mail (2.2104)
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Dec 2015 00:02:06 -0000


> On Dec 23, 2015, at 15:35, Alan Somers <asomers@FreeBSD.org> wrote:
>=20
> Author: asomers
> Date: Wed Dec 23 23:35:32 2015
> New Revision: 292675
> URL: https://svnweb.freebsd.org/changeset/base/292675
>=20
> Log:
>  Fix typo from r292666
>=20
>  Sponsored by:	Spectra Logic Corp
>=20
> Modified:
>  projects/zfsd/head/share/mk/atf.test.mk
>=20
> Modified: projects/zfsd/head/share/mk/atf.test.mk
> =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
> --- projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 22:45:17 2015	=
(r292674)
> +++ projects/zfsd/head/share/mk/atf.test.mk	Wed Dec 23 23:35:32 2015	=
(r292675)
> @@ -95,7 +95,7 @@ CLEANFILES+=3D ${_T} ${_T}.tmp
> ATF_TESTS_KSH93_SED_${_T}?=3D # empty
> ATF_TESTS_KSH93_SRC_${_T}?=3D ${_T}.sh
> ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
> -	echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
> +	echo '#! /usr/libexec/atf-ksh93' > ${.TARGET}.tmp
> .if empty(ATF_TESTS_KSH93_SED_${_T})
> 	cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
> .else

Hi Alan,
	I=E2=80=99ve been watching some of these commits =E2=80=94 I was =
wondering if you=E2=80=99d be for taking all of the IllumOS specific =
testcase logic out of atf.test.mk (to keep it =E2=80=9Cclean=E2=80=9D =
per se) and be open to putting this into a separate .test.mk file, =
similar to the one that Mark Johnston started for dtrace: =
^/head/cddl/usr.sbin/dtrace/tests/dtrace.test.mk ?
Thanks!
-NGie=

From owner-svn-src-projects@freebsd.org  Thu Dec 24 02:05:51 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA24AA4ECA2
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 24 Dec 2015 02:05:51 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: from mail-ob0-x235.google.com (mail-ob0-x235.google.com
 [IPv6:2607:f8b0:4003:c01::235])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id B6C081882;
 Thu, 24 Dec 2015 02:05:51 +0000 (UTC)
 (envelope-from asomers@gmail.com)
Received: by mail-ob0-x235.google.com with SMTP id 18so177665679obc.2;
 Wed, 23 Dec 2015 18:05:51 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type:content-transfer-encoding;
 bh=Dgf1pLI6aKx37VjIj2cCCytV400UycbfxfCPC9idiwM=;
 b=fb7QpQpOWf68cEzOiCNBVqdpSw6Jbr0GIgEv01IgnrQ81Vgirz0atEOaO0iKgYn2NK
 93AyJrfNO75N2pc4QHO06UdgxoytCiLgMv7IvT6olpzhhC1TKH98izOJ17D5/8oYt5Ly
 VrVeZDTwgs2X1VOlkGit+5L9/BS0bqpHZmZIWMw7JHjl0vjfmYjwkhPEQySWNbn9QV8Q
 fHa6dnc4P9WHv+vl3gwvO5pG1Xg8qZOqC4nGTpCDJkQAqQHoOpA0ztD95blN47ytzZfC
 cajKzKmfe1AtIjUjj3QFV+QVYhOhT8yafutzrB1p/UaW1OxuVLj8J3rXq1/axziMJmoe
 C+7Q==
MIME-Version: 1.0
X-Received: by 10.60.132.199 with SMTP id ow7mr16846621oeb.67.1450922750917;
 Wed, 23 Dec 2015 18:05:50 -0800 (PST)
Sender: asomers@gmail.com
Received: by 10.202.69.84 with HTTP; Wed, 23 Dec 2015 18:05:50 -0800 (PST)
In-Reply-To: <C47C4598-67DF-4DED-BFF4-BDFC460A7AD6@gmail.com>
References: <201512232335.tBNNZXra019877@repo.freebsd.org>
 <C47C4598-67DF-4DED-BFF4-BDFC460A7AD6@gmail.com>
Date: Wed, 23 Dec 2015 19:05:50 -0700
X-Google-Sender-Auth: Qi91AbCL75X2DUXMY3i1h0e1Qg4
Message-ID: <CAOtMX2i1hLs3QKOxCoOOg-_beQEr3j1vT5uL_j81p5OadPJviA@mail.gmail.com>
Subject: Re: svn commit: r292675 - projects/zfsd/head/share/mk
From: Alan Somers <asomers@freebsd.org>
To: NGie Cooper <yaneurabeya@gmail.com>
Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>,
 svn-src-projects@freebsd.org
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Dec 2015 02:05:52 -0000

On Wed, Dec 23, 2015 at 5:02 PM, NGie Cooper <yaneurabeya@gmail.com> wrote:
>
>> On Dec 23, 2015, at 15:35, Alan Somers <asomers@FreeBSD.org> wrote:
>>
>> Author: asomers
>> Date: Wed Dec 23 23:35:32 2015
>> New Revision: 292675
>> URL: https://svnweb.freebsd.org/changeset/base/292675
>>
>> Log:
>>  Fix typo from r292666
>>
>>  Sponsored by:        Spectra Logic Corp
>>
>> Modified:
>>  projects/zfsd/head/share/mk/atf.test.mk
>>
>> Modified: projects/zfsd/head/share/mk/atf.test.mk
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
>> --- projects/zfsd/head/share/mk/atf.test.mk   Wed Dec 23 22:45:17 2015  =
      (r292674)
>> +++ projects/zfsd/head/share/mk/atf.test.mk   Wed Dec 23 23:35:32 2015  =
      (r292675)
>> @@ -95,7 +95,7 @@ CLEANFILES+=3D ${_T} ${_T}.tmp
>> ATF_TESTS_KSH93_SED_${_T}?=3D # empty
>> ATF_TESTS_KSH93_SRC_${_T}?=3D ${_T}.sh
>> ${_T}: ${ATF_TESTS_KSH93_SRC_${_T}}
>> -     echo '#! /usr/libexec/atf-sh' > ${.TARGET}.tmp
>> +     echo '#! /usr/libexec/atf-ksh93' > ${.TARGET}.tmp
>> .if empty(ATF_TESTS_KSH93_SED_${_T})
>>       cat ${.ALLSRC:N*Makefile*} >>${.TARGET}.tmp
>> .else
>
> Hi Alan,
>         I=E2=80=99ve been watching some of these commits =E2=80=94 I was =
wondering if you=E2=80=99d be for taking all of the IllumOS specific testca=
se logic out of atf.test.mk (to keep it =E2=80=9Cclean=E2=80=9D per se) and=
 be open to putting this into a separate .test.mk file, similar to the one =
that Mark Johnston started for dtrace: ^/head/cddl/usr.sbin/dtrace/tests/dt=
race.test.mk ?
> Thanks!
> -NGie

Yeah, I think we can do that.  It hadn't occured to me to use separate
.mk files for a subdirectory of tests.
-Alan

From owner-svn-src-projects@freebsd.org  Fri Dec 25 01:27:41 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01C64A5102A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 25 Dec 2015 01:27:41 +0000 (UTC) (envelope-from np@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 mx1.freebsd.org (Postfix) with ESMTPS id 46DF11F93;
 Fri, 25 Dec 2015 01:27:40 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBP1Rdtt082325;
 Fri, 25 Dec 2015 01:27:39 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBP1Ra08082299;
 Fri, 25 Dec 2015 01:27:36 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201512250127.tBP1Ra08082299@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 25 Dec 2015 01:27:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292713 - in projects/cxl_iscsi: . bin/ed
 bin/freebsd-version bin/ls bin/ls/tests bin/sh bin/sh/tests/parameters
 cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa cddl/contrib/...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Dec 2015 01:27:41 -0000

Author: np
Date: Fri Dec 25 01:27:35 2015
New Revision: 292713
URL: https://svnweb.freebsd.org/changeset/base/292713

Log:
  Catch up with HEAD.

Added:
  projects/cxl_iscsi/bin/sh/tests/parameters/positional9.0
     - copied unchanged from r292712, head/bin/sh/tests/parameters/positional9.0
  projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
     - copied unchanged from r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh
  projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
     - copied unchanged from r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out
  projects/cxl_iscsi/contrib/openbsm/.travis.yml
     - copied unchanged from r292712, head/contrib/openbsm/.travis.yml
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_notify.3
     - copied unchanged from r292712, head/contrib/openbsm/libbsm/au_notify.3
  projects/cxl_iscsi/contrib/unbound/.gitignore
     - copied unchanged from r292712, head/contrib/unbound/.gitignore
  projects/cxl_iscsi/contrib/unbound/compat/isblank.c
     - copied unchanged from r292712, head/contrib/unbound/compat/isblank.c
  projects/cxl_iscsi/etc/etc.riscv/
     - copied from r292712, head/etc/etc.riscv/
  projects/cxl_iscsi/lib/csu/riscv/
     - copied from r292712, head/lib/csu/riscv/
  projects/cxl_iscsi/lib/libc/aarch64/sys/__vdso_gettc.c
     - copied unchanged from r292712, head/lib/libc/aarch64/sys/__vdso_gettc.c
  projects/cxl_iscsi/lib/libc/arm/sys/__vdso_gettc.c
     - copied unchanged from r292712, head/lib/libc/arm/sys/__vdso_gettc.c
  projects/cxl_iscsi/lib/libc/riscv/
     - copied from r292712, head/lib/libc/riscv/
  projects/cxl_iscsi/lib/libc/stdlib/tsearch_path.h
     - copied unchanged from r292712, head/lib/libc/stdlib/tsearch_path.h
  projects/cxl_iscsi/lib/libc/tests/nss/
     - copied from r292712, head/lib/libc/tests/nss/
  projects/cxl_iscsi/lib/libc/tests/resolv/
     - copied from r292712, head/lib/libc/tests/resolv/
  projects/cxl_iscsi/lib/libc/tests/stdlib/tsearch_test.c
     - copied unchanged from r292712, head/lib/libc/tests/stdlib/tsearch_test.c
  projects/cxl_iscsi/lib/libstand/uuid_from_string.c
     - copied unchanged from r292712, head/lib/libstand/uuid_from_string.c
  projects/cxl_iscsi/lib/libstand/uuid_to_string.c
     - copied unchanged from r292712, head/lib/libstand/uuid_to_string.c
  projects/cxl_iscsi/lib/libsysdecode/
     - copied from r292712, head/lib/libsysdecode/
  projects/cxl_iscsi/lib/libthr/arch/riscv/
     - copied from r292712, head/lib/libthr/arch/riscv/
  projects/cxl_iscsi/lib/msun/riscv/
     - copied from r292712, head/lib/msun/riscv/
  projects/cxl_iscsi/lib/msun/tests/cexp_test.c
     - copied unchanged from r292712, head/lib/msun/tests/cexp_test.c
  projects/cxl_iscsi/lib/msun/tests/conj_test.c
     - copied unchanged from r292712, head/lib/msun/tests/conj_test.c
  projects/cxl_iscsi/lib/msun/tests/csqrt_test.c
     - copied unchanged from r292712, head/lib/msun/tests/csqrt_test.c
  projects/cxl_iscsi/lib/msun/tests/ctrig_test.c
     - copied unchanged from r292712, head/lib/msun/tests/ctrig_test.c
  projects/cxl_iscsi/lib/msun/tests/exponential_test.c
     - copied unchanged from r292712, head/lib/msun/tests/exponential_test.c
  projects/cxl_iscsi/lib/msun/tests/fenv_test.c
     - copied unchanged from r292712, head/lib/msun/tests/fenv_test.c
  projects/cxl_iscsi/lib/msun/tests/fma_test.c
     - copied unchanged from r292712, head/lib/msun/tests/fma_test.c
  projects/cxl_iscsi/lib/msun/tests/fmaxmin_test.c
     - copied unchanged from r292712, head/lib/msun/tests/fmaxmin_test.c
  projects/cxl_iscsi/lib/msun/tests/ilogb_test.c
     - copied unchanged from r292712, head/lib/msun/tests/ilogb_test.c
  projects/cxl_iscsi/lib/msun/tests/invctrig_test.c
     - copied unchanged from r292712, head/lib/msun/tests/invctrig_test.c
  projects/cxl_iscsi/lib/msun/tests/invtrig_test.c
     - copied unchanged from r292712, head/lib/msun/tests/invtrig_test.c
  projects/cxl_iscsi/lib/msun/tests/logarithm_test.c
     - copied unchanged from r292712, head/lib/msun/tests/logarithm_test.c
  projects/cxl_iscsi/lib/msun/tests/lrint_test.c
     - copied unchanged from r292712, head/lib/msun/tests/lrint_test.c
  projects/cxl_iscsi/lib/msun/tests/lround_test.c
     - copied unchanged from r292712, head/lib/msun/tests/lround_test.c
  projects/cxl_iscsi/lib/msun/tests/lround_test.t
     - copied unchanged from r292712, head/lib/msun/tests/lround_test.t
  projects/cxl_iscsi/lib/msun/tests/nan_test.c
     - copied unchanged from r292712, head/lib/msun/tests/nan_test.c
  projects/cxl_iscsi/lib/msun/tests/nearbyint_test.c
     - copied unchanged from r292712, head/lib/msun/tests/nearbyint_test.c
  projects/cxl_iscsi/lib/msun/tests/next_test.c
     - copied unchanged from r292712, head/lib/msun/tests/next_test.c
  projects/cxl_iscsi/lib/msun/tests/rem_test.c
     - copied unchanged from r292712, head/lib/msun/tests/rem_test.c
  projects/cxl_iscsi/lib/msun/tests/test-utils.h
     - copied unchanged from r292712, head/lib/msun/tests/test-utils.h
  projects/cxl_iscsi/lib/msun/tests/trig_test.c
     - copied unchanged from r292712, head/lib/msun/tests/trig_test.c
  projects/cxl_iscsi/libexec/rtld-elf/riscv/
     - copied from r292712, head/libexec/rtld-elf/riscv/
  projects/cxl_iscsi/share/man/man9/proc_rwmem.9
     - copied unchanged from r292712, head/share/man/man9/proc_rwmem.9
  projects/cxl_iscsi/sys/arm/arm/machdep_intr.c
     - copied unchanged from r292712, head/sys/arm/arm/machdep_intr.c
  projects/cxl_iscsi/sys/arm/arm/ofw_machdep.c
     - copied unchanged from r292712, head/sys/arm/arm/ofw_machdep.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_hdmi.c
     - copied unchanged from r292712, head/sys/arm/freescale/imx/imx6_hdmi.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_hdmireg.h
     - copied unchanged from r292712, head/sys/arm/freescale/imx/imx6_hdmireg.h
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_ipu.c
     - copied unchanged from r292712, head/sys/arm/freescale/imx/imx6_ipu.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx_iomuxreg.h
     - copied unchanged from r292712, head/sys/arm/freescale/imx/imx_iomuxreg.h
  projects/cxl_iscsi/sys/compat/linuxkpi/common/include/linux/srcu.h
     - copied unchanged from r292712, head/sys/compat/linuxkpi/common/include/linux/srcu.h
  projects/cxl_iscsi/sys/dev/bxe/bxe_dump.h
     - copied unchanged from r292712, head/sys/dev/bxe/bxe_dump.h
  projects/cxl_iscsi/sys/dev/bxe/bxe_ioctl.h
     - copied unchanged from r292712, head/sys/dev/bxe/bxe_ioctl.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_osdep.c
     - copied unchanged from r292712, head/sys/dev/ixgbe/ixgbe_osdep.c
  projects/cxl_iscsi/sys/dev/mlx5/eswitch_vacl.h
     - copied unchanged from r292712, head/sys/dev/mlx5/eswitch_vacl.h
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
     - copied unchanged from r292712, head/sys/dev/mlx5/mlx5_core/mlx5_eswitch_vacl.c
  projects/cxl_iscsi/sys/dev/ofw/ofw_subr.c
     - copied unchanged from r292712, head/sys/dev/ofw/ofw_subr.c
  projects/cxl_iscsi/sys/dev/ofw/ofw_subr.h
     - copied unchanged from r292712, head/sys/dev/ofw/ofw_subr.h
  projects/cxl_iscsi/sys/geom/sched/gs_delay.c
     - copied unchanged from r292712, head/sys/geom/sched/gs_delay.c
  projects/cxl_iscsi/sys/kern/pic_if.m
     - copied unchanged from r292712, head/sys/kern/pic_if.m
  projects/cxl_iscsi/sys/kern/subr_intr.c
     - copied unchanged from r292712, head/sys/kern/subr_intr.c
  projects/cxl_iscsi/sys/mips/conf/MT7620
     - copied unchanged from r292712, head/sys/mips/conf/MT7620
  projects/cxl_iscsi/sys/mips/conf/MT7620.hints
     - copied unchanged from r292712, head/sys/mips/conf/MT7620.hints
  projects/cxl_iscsi/sys/mips/conf/RT5350
     - copied unchanged from r292712, head/sys/mips/conf/RT5350
  projects/cxl_iscsi/sys/mips/conf/RT5350.hints
     - copied unchanged from r292712, head/sys/mips/conf/RT5350.hints
  projects/cxl_iscsi/sys/mips/mips/ofw_machdep.c
     - copied unchanged from r292712, head/sys/mips/mips/ofw_machdep.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_ehci.c
     - copied unchanged from r292712, head/sys/mips/rt305x/rt305x_ehci.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_ohci.c
     - copied unchanged from r292712, head/sys/mips/rt305x/rt305x_ohci.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_pci.c
     - copied unchanged from r292712, head/sys/mips/rt305x/rt305x_pci.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_pcireg.h
     - copied unchanged from r292712, head/sys/mips/rt305x/rt305x_pcireg.h
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_spi.c
     - copied unchanged from r292712, head/sys/mips/rt305x/rt305x_spi.c
  projects/cxl_iscsi/sys/modules/geom/geom_sched/gsched_delay/
     - copied from r292712, head/sys/modules/geom/geom_sched/gsched_delay/
  projects/cxl_iscsi/sys/modules/tcp/
     - copied from r292712, head/sys/modules/tcp/
  projects/cxl_iscsi/sys/netinet/in_fib.c
     - copied unchanged from r292712, head/sys/netinet/in_fib.c
  projects/cxl_iscsi/sys/netinet/in_fib.h
     - copied unchanged from r292712, head/sys/netinet/in_fib.h
  projects/cxl_iscsi/sys/netinet/tcp_fastopen.c
     - copied unchanged from r292712, head/sys/netinet/tcp_fastopen.c
  projects/cxl_iscsi/sys/netinet/tcp_fastopen.h
     - copied unchanged from r292712, head/sys/netinet/tcp_fastopen.h
  projects/cxl_iscsi/sys/netinet/tcp_stacks/
     - copied from r292712, head/sys/netinet/tcp_stacks/
  projects/cxl_iscsi/sys/netinet6/in6_fib.c
     - copied unchanged from r292712, head/sys/netinet6/in6_fib.c
  projects/cxl_iscsi/sys/netinet6/in6_fib.h
     - copied unchanged from r292712, head/sys/netinet6/in6_fib.h
  projects/cxl_iscsi/sys/riscv/
     - copied from r292712, head/sys/riscv/
  projects/cxl_iscsi/sys/x86/include/cputypes.h
     - copied unchanged from r292712, head/sys/x86/include/cputypes.h
  projects/cxl_iscsi/sys/x86/include/x86_smp.h
     - copied unchanged from r292712, head/sys/x86/include/x86_smp.h
  projects/cxl_iscsi/sys/x86/include/x86_var.h
     - copied unchanged from r292712, head/sys/x86/include/x86_var.h
  projects/cxl_iscsi/tests/sys/mac/
     - copied from r292712, head/tests/sys/mac/
  projects/cxl_iscsi/tools/tools/nanobsd/embedded/
     - copied from r292712, head/tools/tools/nanobsd/embedded/
  projects/cxl_iscsi/tools/tools/nanobsd/mtree-dedup.awk
     - copied unchanged from r292712, head/tools/tools/nanobsd/mtree-dedup.awk
Deleted:
  projects/cxl_iscsi/sys/arm/arm/intrng.c
  projects/cxl_iscsi/sys/arm/arm/pic_if.m
  projects/cxl_iscsi/sys/arm/include/katelib.h
  projects/cxl_iscsi/sys/dev/ixgbe/LICENSE
  projects/cxl_iscsi/sys/dev/ixgbe/README
  projects/cxl_iscsi/tools/regression/lib/libc/nss/
  projects/cxl_iscsi/tools/regression/lib/libc/resolv/
  projects/cxl_iscsi/tools/regression/lib/msun/
  projects/cxl_iscsi/tools/regression/mac/
  projects/cxl_iscsi/usr.bin/kdump/mkioctls
  projects/cxl_iscsi/usr.bin/kdump/utrace.c
Modified:
  projects/cxl_iscsi/MAINTAINERS   (contents, props changed)
  projects/cxl_iscsi/Makefile
  projects/cxl_iscsi/Makefile.inc1
  projects/cxl_iscsi/UPDATING
  projects/cxl_iscsi/bin/ed/main.c
  projects/cxl_iscsi/bin/freebsd-version/Makefile
  projects/cxl_iscsi/bin/ls/print.c
  projects/cxl_iscsi/bin/ls/tests/ls_tests.sh
  projects/cxl_iscsi/bin/sh/mknodes.c
  projects/cxl_iscsi/bin/sh/tests/parameters/Makefile
  projects/cxl_iscsi/bin/sh/var.c
  projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
  projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/cxl_iscsi/cddl/sbin/zfs/Makefile
  projects/cxl_iscsi/cddl/sbin/zpool/Makefile
  projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
  projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
  projects/cxl_iscsi/cddl/usr.sbin/zdb/Makefile
  projects/cxl_iscsi/cddl/usr.sbin/zhack/Makefile
  projects/cxl_iscsi/contrib/bmake/ChangeLog
  projects/cxl_iscsi/contrib/bmake/Makefile
  projects/cxl_iscsi/contrib/bmake/boot-strap
  projects/cxl_iscsi/contrib/bmake/cond.c
  projects/cxl_iscsi/contrib/bmake/config.h.in
  projects/cxl_iscsi/contrib/bmake/configure
  projects/cxl_iscsi/contrib/bmake/configure.in
  projects/cxl_iscsi/contrib/bmake/main.c
  projects/cxl_iscsi/contrib/bmake/meta.c
  projects/cxl_iscsi/contrib/bmake/mk/ChangeLog
  projects/cxl_iscsi/contrib/bmake/mk/host-target.mk
  projects/cxl_iscsi/contrib/bmake/mk/init.mk
  projects/cxl_iscsi/contrib/bmake/mk/install-mk
  projects/cxl_iscsi/contrib/bmake/mk/lib.mk
  projects/cxl_iscsi/contrib/bmake/mk/meta.autodep.mk
  projects/cxl_iscsi/contrib/bmake/mk/meta.stage.mk
  projects/cxl_iscsi/contrib/bmake/mk/meta.subdir.mk
  projects/cxl_iscsi/contrib/bmake/mk/meta.sys.mk
  projects/cxl_iscsi/contrib/bmake/mk/own.mk
  projects/cxl_iscsi/contrib/bmake/mk/sys.mk
  projects/cxl_iscsi/contrib/bmake/os.sh
  projects/cxl_iscsi/contrib/bmake/parse.c
  projects/cxl_iscsi/contrib/bmake/unit-tests/Makefile.in
  projects/cxl_iscsi/contrib/bmake/unit-tests/cond2.mk
  projects/cxl_iscsi/contrib/bmake/unit-tests/doterror.exp
  projects/cxl_iscsi/contrib/bmake/unit-tests/modts.mk
  projects/cxl_iscsi/contrib/bmake/var.c
  projects/cxl_iscsi/contrib/bsnmp/snmpd/action.c
  projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.1
  projects/cxl_iscsi/contrib/elftoolchain/addr2line/addr2line.c
  projects/cxl_iscsi/contrib/elftoolchain/common/elfdefinitions.h
  projects/cxl_iscsi/contrib/elftoolchain/elfcopy/binary.c
  projects/cxl_iscsi/contrib/elftoolchain/elfcopy/elfcopy.1
  projects/cxl_iscsi/contrib/elftoolchain/elfcopy/main.c
  projects/cxl_iscsi/contrib/elftoolchain/elfcopy/sections.c
  projects/cxl_iscsi/contrib/elftoolchain/elfcopy/segments.c
  projects/cxl_iscsi/contrib/elftoolchain/libelf/elf_data.c
  projects/cxl_iscsi/contrib/elftoolchain/readelf/readelf.c
  projects/cxl_iscsi/contrib/gcc/config/rs6000/sysv4.h
  projects/cxl_iscsi/contrib/libexecinfo/backtrace.3
  projects/cxl_iscsi/contrib/llvm/tools/lldb/docs/lldb.1
  projects/cxl_iscsi/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm64.cpp
  projects/cxl_iscsi/contrib/mdocml/lib.in
  projects/cxl_iscsi/contrib/netbsd-tests/lib/libc/gen/t_assert.c
  projects/cxl_iscsi/contrib/netbsd-tests/lib/libc/ssp/t_ssp.sh
  projects/cxl_iscsi/contrib/netbsd-tests/usr.bin/grep/d_binary.out
  projects/cxl_iscsi/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibaddr/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibnetdiscover/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibping/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibportstate/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibroute/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibsendtrap/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibstat/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibsysstat/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/ibtracert/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/opensm/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/osmtest/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/perfquery/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/saquery/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/sminfo/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/smpdump/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/smpquery/Makefile
  projects/cxl_iscsi/contrib/ofed/usr.bin/vendstat/Makefile
  projects/cxl_iscsi/contrib/openbsm/INSTALL
  projects/cxl_iscsi/contrib/openbsm/LICENSE
  projects/cxl_iscsi/contrib/openbsm/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/Makefile.in
  projects/cxl_iscsi/contrib/openbsm/NEWS
  projects/cxl_iscsi/contrib/openbsm/README
  projects/cxl_iscsi/contrib/openbsm/TODO
  projects/cxl_iscsi/contrib/openbsm/VERSION
  projects/cxl_iscsi/contrib/openbsm/autogen.sh
  projects/cxl_iscsi/contrib/openbsm/bin/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/audit/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/audit/audit.8
  projects/cxl_iscsi/contrib/openbsm/bin/audit/audit.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/audit_triggers.defs
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/audit_warn.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd.8
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd_control.defs
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd_darwin.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditd/auditd_fbsd.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/auditdistd.8
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/auditdistd.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/auditdistd.conf.5
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/auditdistd.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/faccessat.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/fstatat.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/openat.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/parse.y
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/pjdlog.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/pjdlog.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_common.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_impl.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_socketpair.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_tcp.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_tls.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/proto_uds.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/receiver.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/renameat.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/sandbox.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/sandbox.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/sender.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/sigtimedwait.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/strndup.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/subr.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/subr.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/synch.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/token.l
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/trail.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/trail.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditdistd/unlinkat.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditfilterd/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/auditfilterd/auditfilterd.8
  projects/cxl_iscsi/contrib/openbsm/bin/auditfilterd/auditfilterd.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditfilterd/auditfilterd.h
  projects/cxl_iscsi/contrib/openbsm/bin/auditfilterd/auditfilterd_conf.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditreduce/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/auditreduce/auditreduce.1
  projects/cxl_iscsi/contrib/openbsm/bin/auditreduce/auditreduce.c
  projects/cxl_iscsi/contrib/openbsm/bin/auditreduce/auditreduce.h
  projects/cxl_iscsi/contrib/openbsm/bin/praudit/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bin/praudit/praudit.1
  projects/cxl_iscsi/contrib/openbsm/bin/praudit/praudit.c
  projects/cxl_iscsi/contrib/openbsm/bsm/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/bsm/audit_filter.h
  projects/cxl_iscsi/contrib/openbsm/bsm/audit_uevents.h
  projects/cxl_iscsi/contrib/openbsm/bsm/auditd_lib.h
  projects/cxl_iscsi/contrib/openbsm/bsm/libbsm.h
  projects/cxl_iscsi/contrib/openbsm/compat/clock_gettime.h
  projects/cxl_iscsi/contrib/openbsm/compat/closefrom.h
  projects/cxl_iscsi/contrib/openbsm/compat/compat.h
  projects/cxl_iscsi/contrib/openbsm/compat/endian.h
  projects/cxl_iscsi/contrib/openbsm/compat/endian_enc.h
  projects/cxl_iscsi/contrib/openbsm/compat/flopen.h
  projects/cxl_iscsi/contrib/openbsm/compat/pidfile.h
  projects/cxl_iscsi/contrib/openbsm/compat/queue.h
  projects/cxl_iscsi/contrib/openbsm/compat/strlcat.h
  projects/cxl_iscsi/contrib/openbsm/compat/strlcpy.h
  projects/cxl_iscsi/contrib/openbsm/config/config.h
  projects/cxl_iscsi/contrib/openbsm/configure
  projects/cxl_iscsi/contrib/openbsm/configure.ac
  projects/cxl_iscsi/contrib/openbsm/etc/audit_class
  projects/cxl_iscsi/contrib/openbsm/etc/audit_control
  projects/cxl_iscsi/contrib/openbsm/etc/audit_event
  projects/cxl_iscsi/contrib/openbsm/etc/audit_filter
  projects/cxl_iscsi/contrib/openbsm/etc/audit_user
  projects/cxl_iscsi/contrib/openbsm/etc/audit_warn
  projects/cxl_iscsi/contrib/openbsm/libauditd/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/libauditd/auditd_lib.c
  projects/cxl_iscsi/contrib/openbsm/libauditd/libauditd.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/libbsm/Makefile.in
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_class.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_control.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_domain.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_errno.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_event.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_fcntl_cmd.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_free_token.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_io.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_mask.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_open.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_socket_type.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_token.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/au_user.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/audit_submit.3
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_audit.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_class.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_control.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_domain.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_errno.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_event.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_fcntl.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_flags.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_io.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_mask.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_notify.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_socket_type.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_token.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_user.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/bsm_wrappers.c
  projects/cxl_iscsi/contrib/openbsm/libbsm/libbsm.3
  projects/cxl_iscsi/contrib/openbsm/man/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/man/Makefile.in
  projects/cxl_iscsi/contrib/openbsm/man/audit.2
  projects/cxl_iscsi/contrib/openbsm/man/audit.log.5
  projects/cxl_iscsi/contrib/openbsm/man/audit_class.5
  projects/cxl_iscsi/contrib/openbsm/man/audit_control.5
  projects/cxl_iscsi/contrib/openbsm/man/audit_event.5
  projects/cxl_iscsi/contrib/openbsm/man/audit_user.5
  projects/cxl_iscsi/contrib/openbsm/man/audit_warn.5
  projects/cxl_iscsi/contrib/openbsm/man/auditctl.2
  projects/cxl_iscsi/contrib/openbsm/man/auditon.2
  projects/cxl_iscsi/contrib/openbsm/man/getaudit.2
  projects/cxl_iscsi/contrib/openbsm/man/getauid.2
  projects/cxl_iscsi/contrib/openbsm/man/setaudit.2
  projects/cxl_iscsi/contrib/openbsm/man/setauid.2
  projects/cxl_iscsi/contrib/openbsm/modules/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/modules/auditfilter_noop/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
  projects/cxl_iscsi/contrib/openbsm/sys/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_domain.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_errno.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_fcntl.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_internal.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_kevents.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_record.h
  projects/cxl_iscsi/contrib/openbsm/sys/bsm/audit_socket_type.h
  projects/cxl_iscsi/contrib/openbsm/test/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/test/bsm/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/test/bsm/generate.c
  projects/cxl_iscsi/contrib/openbsm/tools/Makefile.am
  projects/cxl_iscsi/contrib/openbsm/tools/audump.c
  projects/cxl_iscsi/contrib/smbfs/README
  projects/cxl_iscsi/contrib/smbfs/lib/smb/nb_name.c
  projects/cxl_iscsi/contrib/top/loadavg.h
  projects/cxl_iscsi/contrib/unbound/Makefile.in
  projects/cxl_iscsi/contrib/unbound/acx_nlnetlabs.m4
  projects/cxl_iscsi/contrib/unbound/compat/arc4random.c
  projects/cxl_iscsi/contrib/unbound/compat/getentropy_linux.c
  projects/cxl_iscsi/contrib/unbound/compat/getentropy_solaris.c
  projects/cxl_iscsi/contrib/unbound/compat/reallocarray.c
  projects/cxl_iscsi/contrib/unbound/compat/sha512.c
  projects/cxl_iscsi/contrib/unbound/compat/snprintf.c
  projects/cxl_iscsi/contrib/unbound/config.h
  projects/cxl_iscsi/contrib/unbound/config.h.in
  projects/cxl_iscsi/contrib/unbound/configure
  projects/cxl_iscsi/contrib/unbound/configure.ac
  projects/cxl_iscsi/contrib/unbound/daemon/remote.c
  projects/cxl_iscsi/contrib/unbound/daemon/unbound.c
  projects/cxl_iscsi/contrib/unbound/daemon/worker.c
  projects/cxl_iscsi/contrib/unbound/dns64/dns64.c
  projects/cxl_iscsi/contrib/unbound/dnstap/dnstap.proto
  projects/cxl_iscsi/contrib/unbound/doc/Changelog
  projects/cxl_iscsi/contrib/unbound/doc/README
  projects/cxl_iscsi/contrib/unbound/doc/example.conf
  projects/cxl_iscsi/contrib/unbound/doc/example.conf.in
  projects/cxl_iscsi/contrib/unbound/doc/libunbound.3
  projects/cxl_iscsi/contrib/unbound/doc/libunbound.3.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound-anchor.8
  projects/cxl_iscsi/contrib/unbound/doc/unbound-anchor.8.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound-checkconf.8
  projects/cxl_iscsi/contrib/unbound/doc/unbound-checkconf.8.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound-control.8
  projects/cxl_iscsi/contrib/unbound/doc/unbound-control.8.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound-host.1
  projects/cxl_iscsi/contrib/unbound/doc/unbound-host.1.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound.8
  projects/cxl_iscsi/contrib/unbound/doc/unbound.8.in
  projects/cxl_iscsi/contrib/unbound/doc/unbound.conf.5
  projects/cxl_iscsi/contrib/unbound/doc/unbound.conf.5.in
  projects/cxl_iscsi/contrib/unbound/freebsd-configure.sh
  projects/cxl_iscsi/contrib/unbound/iterator/iter_scrub.c
  projects/cxl_iscsi/contrib/unbound/iterator/iter_utils.c
  projects/cxl_iscsi/contrib/unbound/iterator/iterator.c
  projects/cxl_iscsi/contrib/unbound/iterator/iterator.h
  projects/cxl_iscsi/contrib/unbound/libunbound/libunbound.c
  projects/cxl_iscsi/contrib/unbound/libunbound/python/Makefile
  projects/cxl_iscsi/contrib/unbound/libunbound/python/doc/install.rst
  projects/cxl_iscsi/contrib/unbound/libunbound/python/doc/modules/unbound.rst
  projects/cxl_iscsi/contrib/unbound/libunbound/python/examples/dnssec-valid.py
  projects/cxl_iscsi/contrib/unbound/libunbound/python/libunbound.i
  projects/cxl_iscsi/contrib/unbound/ltmain.sh
  projects/cxl_iscsi/contrib/unbound/services/cache/dns.c
  projects/cxl_iscsi/contrib/unbound/services/cache/rrset.c
  projects/cxl_iscsi/contrib/unbound/sldns/parseutil.h
  projects/cxl_iscsi/contrib/unbound/sldns/wire2str.c
  projects/cxl_iscsi/contrib/unbound/smallapp/unbound-anchor.c
  projects/cxl_iscsi/contrib/unbound/smallapp/unbound-checkconf.c
  projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control-setup.sh
  projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control-setup.sh.in
  projects/cxl_iscsi/contrib/unbound/smallapp/unbound-control.c
  projects/cxl_iscsi/contrib/unbound/util/config_file.c
  projects/cxl_iscsi/contrib/unbound/util/config_file.h
  projects/cxl_iscsi/contrib/unbound/util/configlexer.lex
  projects/cxl_iscsi/contrib/unbound/util/configparser.y
  projects/cxl_iscsi/contrib/unbound/util/iana_ports.inc
  projects/cxl_iscsi/contrib/unbound/util/locks.c
  projects/cxl_iscsi/contrib/unbound/util/net_help.c
  projects/cxl_iscsi/contrib/unbound/util/random.c
  projects/cxl_iscsi/contrib/unbound/util/rbtree.c
  projects/cxl_iscsi/contrib/unbound/util/rtt.h
  projects/cxl_iscsi/contrib/unbound/util/storage/lookup3.c
  projects/cxl_iscsi/contrib/unbound/util/tube.h
  projects/cxl_iscsi/contrib/unbound/util/winsock_event.h
  projects/cxl_iscsi/contrib/unbound/validator/autotrust.c
  projects/cxl_iscsi/contrib/unbound/validator/val_neg.c
  projects/cxl_iscsi/contrib/unbound/validator/val_neg.h
  projects/cxl_iscsi/contrib/unbound/validator/val_nsec.c
  projects/cxl_iscsi/contrib/unbound/validator/val_nsec.h
  projects/cxl_iscsi/contrib/unbound/validator/val_nsec3.c
  projects/cxl_iscsi/contrib/unbound/validator/val_nsec3.h
  projects/cxl_iscsi/contrib/unbound/validator/val_secalgo.c
  projects/cxl_iscsi/contrib/unbound/validator/val_secalgo.h
  projects/cxl_iscsi/contrib/unbound/validator/val_sigcrypt.c
  projects/cxl_iscsi/contrib/unbound/validator/val_utils.h
  projects/cxl_iscsi/contrib/unbound/validator/validator.c
  projects/cxl_iscsi/crypto/openssh/digest-libc.c
  projects/cxl_iscsi/etc/mtree/BSD.tests.dist
  projects/cxl_iscsi/etc/mtree/BSD.usr.dist
  projects/cxl_iscsi/etc/periodic/daily/800.scrub-zfs
  projects/cxl_iscsi/etc/services
  projects/cxl_iscsi/gnu/usr.bin/binutils/ld/Makefile
  projects/cxl_iscsi/include/netdb.h
  projects/cxl_iscsi/include/resolv.h
  projects/cxl_iscsi/include/search.h
  projects/cxl_iscsi/kerberos5/lib/libgssapi_krb5/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libgssapi_ntlm/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libhdb/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libheimntlm/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libkadm5clnt/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libkadm5srv/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libkafs5/Makefile.depend
  projects/cxl_iscsi/kerberos5/lib/libkdc/Makefile.depend
  projects/cxl_iscsi/lib/Makefile
  projects/cxl_iscsi/lib/csu/aarch64/crt1.c
  projects/cxl_iscsi/lib/csu/amd64/crt1.c
  projects/cxl_iscsi/lib/csu/arm/crt1.c
  projects/cxl_iscsi/lib/csu/i386/crt1_c.c
  projects/cxl_iscsi/lib/csu/mips/crt1.c
  projects/cxl_iscsi/lib/csu/powerpc/crt1.c
  projects/cxl_iscsi/lib/csu/powerpc64/crt1.c
  projects/cxl_iscsi/lib/csu/sparc64/crt1.c
  projects/cxl_iscsi/lib/lib80211/Makefile.depend
  projects/cxl_iscsi/lib/lib80211/lib80211.3
  projects/cxl_iscsi/lib/libbsm/Makefile
  projects/cxl_iscsi/lib/libc/aarch64/sys/Makefile.inc
  projects/cxl_iscsi/lib/libc/arm/sys/Makefile.inc
  projects/cxl_iscsi/lib/libc/gen/exec.3
  projects/cxl_iscsi/lib/libc/gen/getnetgrent.c
  projects/cxl_iscsi/lib/libc/gen/getpeereid.c
  projects/cxl_iscsi/lib/libc/gen/lockf.c
  projects/cxl_iscsi/lib/libc/gen/nlist.c
  projects/cxl_iscsi/lib/libc/gen/sysconf.c
  projects/cxl_iscsi/lib/libc/iconv/citrus_mmap.c
  projects/cxl_iscsi/lib/libc/net/getaddrinfo.3
  projects/cxl_iscsi/lib/libc/net/getaddrinfo.c
  projects/cxl_iscsi/lib/libc/net/map_v4v6.c
  projects/cxl_iscsi/lib/libc/net/name6.c
  projects/cxl_iscsi/lib/libc/net/rcmdsh.c
  projects/cxl_iscsi/lib/libc/regex/grot/Makefile
  projects/cxl_iscsi/lib/libc/regex/grot/debug.c
  projects/cxl_iscsi/lib/libc/regex/grot/main.c
  projects/cxl_iscsi/lib/libc/regex/grot/split.c
  projects/cxl_iscsi/lib/libc/resolv/res_init.c
  projects/cxl_iscsi/lib/libc/resolv/res_mkquery.c
  projects/cxl_iscsi/lib/libc/resolv/res_mkupdate.c
  projects/cxl_iscsi/lib/libc/resolv/res_private.h
  projects/cxl_iscsi/lib/libc/resolv/res_query.c
  projects/cxl_iscsi/lib/libc/resolv/res_send.c
  projects/cxl_iscsi/lib/libc/resolv/res_state.c
  projects/cxl_iscsi/lib/libc/rpc/svc_vc.c
  projects/cxl_iscsi/lib/libc/stdio/open_memstream.c
  projects/cxl_iscsi/lib/libc/stdio/open_wmemstream.c
  projects/cxl_iscsi/lib/libc/stdlib/tdelete.c
  projects/cxl_iscsi/lib/libc/stdlib/tsearch.3
  projects/cxl_iscsi/lib/libc/stdlib/tsearch.c
  projects/cxl_iscsi/lib/libc/sys/brk.2
  projects/cxl_iscsi/lib/libc/sys/clock_gettime.2
  projects/cxl_iscsi/lib/libc/sys/getgid.2
  projects/cxl_iscsi/lib/libc/sys/getpid.2
  projects/cxl_iscsi/lib/libc/sys/gettimeofday.2
  projects/cxl_iscsi/lib/libc/sys/getuid.2
  projects/cxl_iscsi/lib/libc/sys/read.2
  projects/cxl_iscsi/lib/libc/sys/setuid.2
  projects/cxl_iscsi/lib/libc/sys/utrace.2
  projects/cxl_iscsi/lib/libc/sys/write.2
  projects/cxl_iscsi/lib/libc/tests/Makefile
  projects/cxl_iscsi/lib/libc/tests/ssp/Makefile
  projects/cxl_iscsi/lib/libc/tests/stdio/getdelim_test.c
  projects/cxl_iscsi/lib/libc/tests/stdio/printbasic_test.c
  projects/cxl_iscsi/lib/libc/tests/stdio/printfloat_test.c
  projects/cxl_iscsi/lib/libc/tests/stdlib/Makefile
  projects/cxl_iscsi/lib/libcuse/cuse_lib.c
  projects/cxl_iscsi/lib/libfetch/http.c
  projects/cxl_iscsi/lib/libopenbsd/Makefile
  projects/cxl_iscsi/lib/libopenbsd/imsg.c
  projects/cxl_iscsi/lib/libpam/modules/pam_krb5/Makefile.depend
  projects/cxl_iscsi/lib/libpam/modules/pam_ksu/Makefile.depend
  projects/cxl_iscsi/lib/libpam/modules/pam_ssh/Makefile
  projects/cxl_iscsi/lib/libstand/Makefile
  projects/cxl_iscsi/lib/libstand/bootp.c
  projects/cxl_iscsi/lib/libstand/tftp.c
  projects/cxl_iscsi/lib/libthr/thread/thr_init.c
  projects/cxl_iscsi/lib/libthr/thread/thr_private.h
  projects/cxl_iscsi/lib/msun/tests/Makefile
  projects/cxl_iscsi/libexec/rtld-elf/rtld.c
  projects/cxl_iscsi/sbin/devd/devd.cc
  projects/cxl_iscsi/sbin/geom/class/multipath/geom_multipath.c
  projects/cxl_iscsi/sbin/geom/class/part/gpart.8
  projects/cxl_iscsi/sbin/ifconfig/Makefile
  projects/cxl_iscsi/sbin/mount/mount.c
  projects/cxl_iscsi/sbin/newfs_msdos/mkfs_msdos.c
  projects/cxl_iscsi/sbin/reboot/reboot.8
  projects/cxl_iscsi/sbin/reboot/reboot.c
  projects/cxl_iscsi/sbin/swapon/swapon.c
  projects/cxl_iscsi/sbin/sysctl/sysctl.8
  projects/cxl_iscsi/sbin/sysctl/sysctl.c
  projects/cxl_iscsi/secure/lib/libcrypto/engines/Makefile
  projects/cxl_iscsi/secure/lib/libssh/Makefile
  projects/cxl_iscsi/secure/libexec/sftp-server/Makefile
  projects/cxl_iscsi/secure/libexec/ssh-keysign/Makefile
  projects/cxl_iscsi/secure/libexec/ssh-pkcs11-helper/Makefile
  projects/cxl_iscsi/secure/usr.bin/scp/Makefile
  projects/cxl_iscsi/secure/usr.bin/sftp/Makefile
  projects/cxl_iscsi/secure/usr.bin/ssh-add/Makefile
  projects/cxl_iscsi/secure/usr.bin/ssh-agent/Makefile
  projects/cxl_iscsi/secure/usr.bin/ssh-keygen/Makefile
  projects/cxl_iscsi/secure/usr.bin/ssh-keyscan/Makefile
  projects/cxl_iscsi/secure/usr.bin/ssh/Makefile
  projects/cxl_iscsi/secure/usr.sbin/sshd/Makefile
  projects/cxl_iscsi/share/colldef/Makefile
  projects/cxl_iscsi/share/ctypedef/Makefile
  projects/cxl_iscsi/share/examples/etc/make.conf
  projects/cxl_iscsi/share/examples/tests/tests/atf/printf_test.c
  projects/cxl_iscsi/share/man/man4/aesni.4
  projects/cxl_iscsi/share/man/man4/blackhole.4
  projects/cxl_iscsi/share/man/man4/crypto.4
  projects/cxl_iscsi/share/man/man4/dtrace_io.4
  projects/cxl_iscsi/share/man/man4/dtrace_ip.4
  projects/cxl_iscsi/share/man/man4/dtrace_tcp.4
  projects/cxl_iscsi/share/man/man4/dtrace_udp.4
  projects/cxl_iscsi/share/man/man4/ioat.4
  projects/cxl_iscsi/share/man/man4/isp.4
  projects/cxl_iscsi/share/man/man4/mlx5en.4
  projects/cxl_iscsi/share/man/man4/mps.4
  projects/cxl_iscsi/share/man/man4/netmap.4
  projects/cxl_iscsi/share/man/man4/pass.4
  projects/cxl_iscsi/share/man/man4/sfxge.4
  projects/cxl_iscsi/share/man/man5/src.conf.5
  projects/cxl_iscsi/share/man/man7/release.7
  projects/cxl_iscsi/share/man/man7/tests.7
  projects/cxl_iscsi/share/man/man9/BUS_DESCRIBE_INTR.9
  projects/cxl_iscsi/share/man/man9/Makefile
  projects/cxl_iscsi/share/man/man9/VOP_GETPAGES.9
  projects/cxl_iscsi/share/man/man9/g_bio.9
  projects/cxl_iscsi/share/man/man9/pci.9
  projects/cxl_iscsi/share/man/man9/style.9
  projects/cxl_iscsi/share/man/man9/zone.9
  projects/cxl_iscsi/share/misc/bsd-family-tree
  projects/cxl_iscsi/share/misc/committers-ports.dot
  projects/cxl_iscsi/share/mk/atf.test.mk
  projects/cxl_iscsi/share/mk/bsd.README
  projects/cxl_iscsi/share/mk/bsd.compiler.mk
  projects/cxl_iscsi/share/mk/bsd.cpu.mk
  projects/cxl_iscsi/share/mk/bsd.dep.mk
  projects/cxl_iscsi/share/mk/bsd.endian.mk
  projects/cxl_iscsi/share/mk/bsd.lib.mk
  projects/cxl_iscsi/share/mk/bsd.libnames.mk
  projects/cxl_iscsi/share/mk/bsd.opts.mk
  projects/cxl_iscsi/share/mk/bsd.snmpmod.mk
  projects/cxl_iscsi/share/mk/bsd.sys.mk
  projects/cxl_iscsi/share/mk/bsd.test.mk
  projects/cxl_iscsi/share/mk/local.dirdeps.mk
  projects/cxl_iscsi/share/mk/local.meta.sys.mk
  projects/cxl_iscsi/share/mk/src.libnames.mk
  projects/cxl_iscsi/share/mk/src.opts.mk
  projects/cxl_iscsi/share/mk/suite.test.mk
  projects/cxl_iscsi/share/mk/sys.mk
  projects/cxl_iscsi/share/mk/tap.test.mk
  projects/cxl_iscsi/share/monetdef/Makefile
  projects/cxl_iscsi/share/msgdef/Makefile
  projects/cxl_iscsi/share/numericdef/Makefile
  projects/cxl_iscsi/share/timedef/Makefile
  projects/cxl_iscsi/share/timedef/ja_JP.SJIS.src
  projects/cxl_iscsi/share/timedef/ja_JP.UTF-8.src
  projects/cxl_iscsi/share/timedef/ja_JP.eucJP.src
  projects/cxl_iscsi/sys/amd64/amd64/initcpu.c
  projects/cxl_iscsi/sys/amd64/amd64/machdep.c
  projects/cxl_iscsi/sys/amd64/amd64/pmap.c
  projects/cxl_iscsi/sys/amd64/include/cputypes.h
  projects/cxl_iscsi/sys/amd64/include/md_var.h
  projects/cxl_iscsi/sys/amd64/include/smp.h
  projects/cxl_iscsi/sys/arm/allwinner/a10_mmc.c
  projects/cxl_iscsi/sys/arm/allwinner/a20/a20_mp.c
  projects/cxl_iscsi/sys/arm/altera/socfpga/socfpga_mp.c
  projects/cxl_iscsi/sys/arm/amlogic/aml8726/aml8726_mmc.c
  projects/cxl_iscsi/sys/arm/amlogic/aml8726/aml8726_mp.c
  projects/cxl_iscsi/sys/arm/amlogic/aml8726/aml8726_sdxc-m8.c
  projects/cxl_iscsi/sys/arm/annapurna/alpine/alpine_machdep_mp.c
  projects/cxl_iscsi/sys/arm/arm/elf_machdep.c
  projects/cxl_iscsi/sys/arm/arm/exception.S
  projects/cxl_iscsi/sys/arm/arm/genassym.c
  projects/cxl_iscsi/sys/arm/arm/generic_timer.c
  projects/cxl_iscsi/sys/arm/arm/gic.c
  projects/cxl_iscsi/sys/arm/arm/intr.c
  projects/cxl_iscsi/sys/arm/arm/locore-v4.S
  projects/cxl_iscsi/sys/arm/arm/machdep.c
  projects/cxl_iscsi/sys/arm/arm/mp_machdep.c
  projects/cxl_iscsi/sys/arm/arm/nexus.c
  projects/cxl_iscsi/sys/arm/arm/pmap-v6-new.c
  projects/cxl_iscsi/sys/arm/arm/trap-v6.c
  projects/cxl_iscsi/sys/arm/arm/trap.c
  projects/cxl_iscsi/sys/arm/arm/undefined.c
  projects/cxl_iscsi/sys/arm/at91/at91_mci.c
  projects/cxl_iscsi/sys/arm/at91/std.bwct
  projects/cxl_iscsi/sys/arm/at91/std.eb9200
  projects/cxl_iscsi/sys/arm/at91/std.ethernut5
  projects/cxl_iscsi/sys/arm/at91/std.hl200
  projects/cxl_iscsi/sys/arm/at91/std.hl201
  projects/cxl_iscsi/sys/arm/at91/std.kb920x
  projects/cxl_iscsi/sys/arm/at91/std.qila9g20
  projects/cxl_iscsi/sys/arm/at91/std.sam9260ek
  projects/cxl_iscsi/sys/arm/at91/std.sam9g20ek
  projects/cxl_iscsi/sys/arm/at91/std.sam9x25ek
  projects/cxl_iscsi/sys/arm/at91/std.sn9g45
  projects/cxl_iscsi/sys/arm/at91/std.tsc4370
  projects/cxl_iscsi/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
  projects/cxl_iscsi/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/cxl_iscsi/sys/arm/cavium/cns11xx/std.econa
  projects/cxl_iscsi/sys/arm/conf/ATMEL
  projects/cxl_iscsi/sys/arm/conf/CNS11XXNAS
  projects/cxl_iscsi/sys/arm/conf/CRB
  projects/cxl_iscsi/sys/arm/conf/GUMSTIX
  projects/cxl_iscsi/sys/arm/conf/IMX6
  projects/cxl_iscsi/sys/arm/conf/NOTES
  projects/cxl_iscsi/sys/arm/conf/NSLU
  projects/cxl_iscsi/sys/arm/conf/SAM9260EK
  projects/cxl_iscsi/sys/arm/conf/SAM9G20EK
  projects/cxl_iscsi/sys/arm/freescale/imx/files.imx6
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_ccm.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_ccmreg.h
  projects/cxl_iscsi/sys/arm/freescale/imx/imx6_mp.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx_ccmvar.h
  projects/cxl_iscsi/sys/arm/freescale/imx/imx_gpio.c
  projects/cxl_iscsi/sys/arm/freescale/imx/imx_sdhci.c
  projects/cxl_iscsi/sys/arm/include/cpufunc.h
  projects/cxl_iscsi/sys/arm/include/intr.h
  projects/cxl_iscsi/sys/arm/include/md_var.h
  projects/cxl_iscsi/sys/arm/include/ofw_machdep.h
  projects/cxl_iscsi/sys/arm/include/pmap-v6.h
  projects/cxl_iscsi/sys/arm/include/smp.h
  projects/cxl_iscsi/sys/arm/include/trap.h
  projects/cxl_iscsi/sys/arm/include/vdso.h
  projects/cxl_iscsi/sys/arm/include/vmparam.h
  projects/cxl_iscsi/sys/arm/lpc/lpc_mmc.c
  projects/cxl_iscsi/sys/arm/lpc/std.lpc
  projects/cxl_iscsi/sys/arm/mv/discovery/std.db78xxx
  projects/cxl_iscsi/sys/arm/mv/kirkwood/std.kirkwood
  projects/cxl_iscsi/sys/arm/mv/orion/std.db88f5xxx
  projects/cxl_iscsi/sys/arm/mv/orion/std.ts7800
  projects/cxl_iscsi/sys/arm/qemu/virt_mp.c
  projects/cxl_iscsi/sys/arm/rockchip/rk30xx_mp.c
  projects/cxl_iscsi/sys/arm/samsung/exynos/exynos5_mp.c
  projects/cxl_iscsi/sys/arm/ti/aintc.c
  projects/cxl_iscsi/sys/arm/ti/omap4/omap4_mp.c
  projects/cxl_iscsi/sys/arm/ti/ti_sdhci.c
  projects/cxl_iscsi/sys/arm/xilinx/zy7_mp.c
  projects/cxl_iscsi/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/cxl_iscsi/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/cxl_iscsi/sys/arm/xscale/i8134x/crb_machdep.c
  projects/cxl_iscsi/sys/arm/xscale/ixp425/avila_machdep.c
  projects/cxl_iscsi/sys/arm/xscale/ixp425/std.avila
  projects/cxl_iscsi/sys/arm/xscale/pxa/pxa_machdep.c
  projects/cxl_iscsi/sys/arm64/arm64/elf_machdep.c
  projects/cxl_iscsi/sys/arm64/arm64/exception.S
  projects/cxl_iscsi/sys/arm64/arm64/gic.c
  projects/cxl_iscsi/sys/arm64/arm64/gic.h
  projects/cxl_iscsi/sys/arm64/arm64/gic_fdt.c
  projects/cxl_iscsi/sys/arm64/arm64/gic_v3_its.c
  projects/cxl_iscsi/sys/arm64/arm64/gic_v3_var.h
  projects/cxl_iscsi/sys/arm64/arm64/intr_machdep.c
  projects/cxl_iscsi/sys/arm64/arm64/machdep.c
  projects/cxl_iscsi/sys/arm64/arm64/pic_if.m
  projects/cxl_iscsi/sys/arm64/cavium/thunder_pcie.c
  projects/cxl_iscsi/sys/arm64/cavium/thunder_pcie_common.c
  projects/cxl_iscsi/sys/arm64/cavium/thunder_pcie_pem.c
  projects/cxl_iscsi/sys/arm64/conf/GENERIC
  projects/cxl_iscsi/sys/arm64/include/intr.h
  projects/cxl_iscsi/sys/arm64/include/md_var.h
  projects/cxl_iscsi/sys/arm64/include/ofw_machdep.h
  projects/cxl_iscsi/sys/arm64/include/setjmp.h
  projects/cxl_iscsi/sys/arm64/include/vdso.h
  projects/cxl_iscsi/sys/arm64/include/vmparam.h
  projects/cxl_iscsi/sys/boot/common/part.c
  projects/cxl_iscsi/sys/boot/efi/boot1/boot1.c
  projects/cxl_iscsi/sys/boot/efi/loader/Makefile
  projects/cxl_iscsi/sys/boot/efi/loader/arch/amd64/elf64_freebsd.c
  projects/cxl_iscsi/sys/boot/efi/loader/arch/amd64/framebuffer.c
  projects/cxl_iscsi/sys/boot/efi/loader/arch/arm/exec.c
  projects/cxl_iscsi/sys/boot/efi/loader/arch/arm64/exec.c
  projects/cxl_iscsi/sys/boot/efi/loader/bootinfo.c
  projects/cxl_iscsi/sys/boot/efi/loader/devicename.c
  projects/cxl_iscsi/sys/boot/efi/loader/loader_efi.h
  projects/cxl_iscsi/sys/boot/efi/loader/main.c
  projects/cxl_iscsi/sys/boot/i386/libi386/biosmem.c
  projects/cxl_iscsi/sys/boot/i386/libi386/libi386.h
  projects/cxl_iscsi/sys/boot/i386/libi386/pxe.c
  projects/cxl_iscsi/sys/boot/i386/loader/main.c
  projects/cxl_iscsi/sys/boot/i386/zfsboot/zfsboot.c
  projects/cxl_iscsi/sys/boot/libstand32/Makefile
  projects/cxl_iscsi/sys/boot/pc98/boot2/boot2.c
  projects/cxl_iscsi/sys/boot/pc98/libpc98/biosdisk.c
  projects/cxl_iscsi/sys/boot/uboot/common/main.c
  projects/cxl_iscsi/sys/boot/userboot/test/Makefile.depend
  projects/cxl_iscsi/sys/bsm/audit.h
  projects/cxl_iscsi/sys/bsm/audit_domain.h
  projects/cxl_iscsi/sys/bsm/audit_errno.h
  projects/cxl_iscsi/sys/bsm/audit_fcntl.h
  projects/cxl_iscsi/sys/bsm/audit_internal.h
  projects/cxl_iscsi/sys/bsm/audit_kevents.h
  projects/cxl_iscsi/sys/bsm/audit_record.h
  projects/cxl_iscsi/sys/bsm/audit_socket_type.h
  projects/cxl_iscsi/sys/cam/cam_ccb.h
  projects/cxl_iscsi/sys/cam/cam_xpt.c
  projects/cxl_iscsi/sys/cam/ctl/ctl.c
  projects/cxl_iscsi/sys/cam/ctl/ctl_backend_block.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
  projects/cxl_iscsi/sys/cddl/dev/dtrace/dtrace_cddl.h
  projects/cxl_iscsi/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/cxl_iscsi/sys/cddl/dev/fbt/arm/fbt_isa.c
  projects/cxl_iscsi/sys/cddl/dev/profile/profile.c
  projects/cxl_iscsi/sys/cddl/dev/systrace/systrace.c
  projects/cxl_iscsi/sys/compat/linux/linux_dtrace.h
  projects/cxl_iscsi/sys/compat/linuxkpi/common/include/linux/compiler.h
  projects/cxl_iscsi/sys/compat/linuxkpi/common/include/linux/workqueue.h
  projects/cxl_iscsi/sys/compat/linuxkpi/common/src/linux_compat.c
  projects/cxl_iscsi/sys/conf/files
  projects/cxl_iscsi/sys/conf/files.arm
  projects/cxl_iscsi/sys/conf/files.arm64
  projects/cxl_iscsi/sys/conf/files.mips
  projects/cxl_iscsi/sys/conf/files.powerpc
  projects/cxl_iscsi/sys/conf/kmod.mk
  projects/cxl_iscsi/sys/conf/options
  projects/cxl_iscsi/sys/conf/options.arm
  projects/cxl_iscsi/sys/conf/options.mips
  projects/cxl_iscsi/sys/contrib/ipfilter/netinet/ip_nat.c
  projects/cxl_iscsi/sys/dev/aic/aic_pccard.c
  projects/cxl_iscsi/sys/dev/an/if_an_pccard.c
  projects/cxl_iscsi/sys/dev/ata/ata-card.c
  projects/cxl_iscsi/sys/dev/atkbdc/psm.c
  projects/cxl_iscsi/sys/dev/bwn/if_bwn.c
  projects/cxl_iscsi/sys/dev/bxe/bxe.c
  projects/cxl_iscsi/sys/dev/bxe/bxe.h
  projects/cxl_iscsi/sys/dev/bxe/bxe_stats.c
  projects/cxl_iscsi/sys/dev/bxe/bxe_stats.h
  projects/cxl_iscsi/sys/dev/bxe/ecore_init.h
  projects/cxl_iscsi/sys/dev/cmx/cmx_pccard.c
  projects/cxl_iscsi/sys/dev/cs/if_cs_pccard.c
  projects/cxl_iscsi/sys/dev/cxgbe/t4_main.c
  projects/cxl_iscsi/sys/dev/drm2/i915/i915_gem.c
  projects/cxl_iscsi/sys/dev/drm2/i915/intel_iic.c
  projects/cxl_iscsi/sys/dev/drm2/ttm/ttm_bo.c
  projects/cxl_iscsi/sys/dev/drm2/ttm/ttm_page_alloc.c
  projects/cxl_iscsi/sys/dev/drm2/ttm/ttm_tt.c
  projects/cxl_iscsi/sys/dev/e1000/if_igb.c
  projects/cxl_iscsi/sys/dev/e1000/if_igb.h
  projects/cxl_iscsi/sys/dev/ed/if_ed_isa.c
  projects/cxl_iscsi/sys/dev/ed/if_ed_pccard.c
  projects/cxl_iscsi/sys/dev/ed/if_ed_pci.c
  projects/cxl_iscsi/sys/dev/ep/if_ep_pccard.c
  projects/cxl_iscsi/sys/dev/etherswitch/arswitch/arswitch_9340.c
  projects/cxl_iscsi/sys/dev/ex/if_ex_pccard.c
  projects/cxl_iscsi/sys/dev/fdc/fdc_pccard.c
  projects/cxl_iscsi/sys/dev/fdt/simplebus.c
  projects/cxl_iscsi/sys/dev/fe/if_fe_pccard.c
  projects/cxl_iscsi/sys/dev/hwpmc/hwpmc_core.c
  projects/cxl_iscsi/sys/dev/hwpmc/hwpmc_logging.c
  projects/cxl_iscsi/sys/dev/hyperv/utilities/hv_kvp.c
  projects/cxl_iscsi/sys/dev/hyperv/vmbus/hv_channel_mgmt.c
  projects/cxl_iscsi/sys/dev/if_ndis/if_ndis_pci.c
  projects/cxl_iscsi/sys/dev/ioat/ioat.c
  projects/cxl_iscsi/sys/dev/ioat/ioat.h
  projects/cxl_iscsi/sys/dev/ioat/ioat_hw.h
  projects/cxl_iscsi/sys/dev/ioat/ioat_internal.h
  projects/cxl_iscsi/sys/dev/ioat/ioat_test.c
  projects/cxl_iscsi/sys/dev/ioat/ioat_test.h
  projects/cxl_iscsi/sys/dev/iscsi/iscsi.c
  projects/cxl_iscsi/sys/dev/isp/isp.c
  projects/cxl_iscsi/sys/dev/isp/isp_freebsd.c
  projects/cxl_iscsi/sys/dev/isp/isp_freebsd.h
  projects/cxl_iscsi/sys/dev/isp/isp_pci.c
  projects/cxl_iscsi/sys/dev/isp/isp_sbus.c
  projects/cxl_iscsi/sys/dev/isp/ispmbox.h
  projects/cxl_iscsi/sys/dev/ixgbe/if_ix.c
  projects/cxl_iscsi/sys/dev/ixgbe/if_ixv.c
  projects/cxl_iscsi/sys/dev/ixgbe/ix_txrx.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_82598.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_82599.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_api.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_api.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_common.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_dcb.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_osdep.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_phy.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_phy.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_type.h
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_vf.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_x540.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_x550.c
  projects/cxl_iscsi/sys/dev/ixgbe/ixgbe_x550.h
  projects/cxl_iscsi/sys/dev/md/md.c
  projects/cxl_iscsi/sys/dev/mlx5/device.h
  projects/cxl_iscsi/sys/dev/mlx5/driver.h
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_core/mlx5_eq.c
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_core/mlx5_vport.c
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_en/en.h
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c
  projects/cxl_iscsi/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
  projects/cxl_iscsi/sys/dev/mlx5/vport.h
  projects/cxl_iscsi/sys/dev/mmc/bridge.h
  projects/cxl_iscsi/sys/dev/mmc/host/dwmmc.c
  projects/cxl_iscsi/sys/dev/mmc/mmc.c
  projects/cxl_iscsi/sys/dev/mpr/mpr_sas_lsi.c
  projects/cxl_iscsi/sys/dev/mps/mps_sas_lsi.c
  projects/cxl_iscsi/sys/dev/nand/nand_cdev.c
  projects/cxl_iscsi/sys/dev/nand/nand_geom.c
  projects/cxl_iscsi/sys/dev/ncv/ncr53c500_pccard.c
  projects/cxl_iscsi/sys/dev/nsp/nsp_pccard.c
  projects/cxl_iscsi/sys/dev/nvd/nvd.c
  projects/cxl_iscsi/sys/dev/nvme/nvme.h
  projects/cxl_iscsi/sys/dev/nvme/nvme_ns.c
  projects/cxl_iscsi/sys/dev/nvme/nvme_sysctl.c
  projects/cxl_iscsi/sys/dev/ofw/ofw_bus_subr.c
  projects/cxl_iscsi/sys/dev/ofw/ofw_bus_subr.h
  projects/cxl_iscsi/sys/dev/ofw/ofw_iicbus.c
  projects/cxl_iscsi/sys/dev/ofw/openfirm.h
  projects/cxl_iscsi/sys/dev/otus/if_otus.c
  projects/cxl_iscsi/sys/dev/pccard/pccardvar.h
  projects/cxl_iscsi/sys/dev/pci/pci.c
  projects/cxl_iscsi/sys/dev/pci/pci_host_generic.c
  projects/cxl_iscsi/sys/dev/pci/pci_if.m
  projects/cxl_iscsi/sys/dev/pci/pci_private.h
  projects/cxl_iscsi/sys/dev/pci/pcivar.h
  projects/cxl_iscsi/sys/dev/ral/rt2560.c
  projects/cxl_iscsi/sys/dev/ral/rt2661.c
  projects/cxl_iscsi/sys/dev/ral/rt2860.c
  projects/cxl_iscsi/sys/dev/rt/if_rt.c
  projects/cxl_iscsi/sys/dev/rt/if_rtreg.h
  projects/cxl_iscsi/sys/dev/rt/if_rtvar.h
  projects/cxl_iscsi/sys/dev/sdhci/sdhci_fdt.c
  projects/cxl_iscsi/sys/dev/sdhci/sdhci_pci.c
  projects/cxl_iscsi/sys/dev/sfxge/common/ef10_tlv_layout.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efsys.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efx.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_check.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_crc32.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_filter.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_impl.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_mcdi.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_mcdi.h
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_nic.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_nvram.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_tx.c
  projects/cxl_iscsi/sys/dev/sfxge/common/efx_types.h
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_ev.c
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_impl.h
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_mcdi.c
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_nic.c
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_nvram.c
  projects/cxl_iscsi/sys/dev/sfxge/common/hunt_tx.c
  projects/cxl_iscsi/sys/dev/sfxge/common/siena_impl.h
  projects/cxl_iscsi/sys/dev/sfxge/common/siena_mcdi.c
  projects/cxl_iscsi/sys/dev/sfxge/common/siena_nic.c
  projects/cxl_iscsi/sys/dev/sfxge/sfxge.c
  projects/cxl_iscsi/sys/dev/sfxge/sfxge.h
  projects/cxl_iscsi/sys/dev/sfxge/sfxge_mcdi.c
  projects/cxl_iscsi/sys/dev/sfxge/sfxge_tx.c
  projects/cxl_iscsi/sys/dev/sn/if_sn_pccard.c
  projects/cxl_iscsi/sys/dev/snc/if_snc_pccard.c
  projects/cxl_iscsi/sys/dev/sound/usb/uaudio.c
  projects/cxl_iscsi/sys/dev/stg/tmc18c30_pccard.c
  projects/cxl_iscsi/sys/dev/uart/uart_bus_pccard.c
  projects/cxl_iscsi/sys/dev/uart/uart_dev_imx.h
  projects/cxl_iscsi/sys/dev/usb/controller/xhci.h
  projects/cxl_iscsi/sys/dev/usb/controller/xhci_pci.c
  projects/cxl_iscsi/sys/dev/usb/input/atp.c
  projects/cxl_iscsi/sys/dev/usb/input/uep.c
  projects/cxl_iscsi/sys/dev/usb/input/uhid.c
  projects/cxl_iscsi/sys/dev/usb/input/ukbd.c
  projects/cxl_iscsi/sys/dev/usb/input/ums.c
  projects/cxl_iscsi/sys/dev/usb/input/wsp.c
  projects/cxl_iscsi/sys/dev/usb/misc/udbp.c
  projects/cxl_iscsi/sys/dev/usb/misc/ufm.c
  projects/cxl_iscsi/sys/dev/usb/misc/ugold.c
  projects/cxl_iscsi/sys/dev/usb/misc/uled.c
  projects/cxl_iscsi/sys/dev/usb/net/if_aue.c
  projects/cxl_iscsi/sys/dev/usb/net/if_axe.c
  projects/cxl_iscsi/sys/dev/usb/net/if_axge.c
  projects/cxl_iscsi/sys/dev/usb/net/if_cdce.c
  projects/cxl_iscsi/sys/dev/usb/net/if_cue.c
  projects/cxl_iscsi/sys/dev/usb/net/if_ipheth.c
  projects/cxl_iscsi/sys/dev/usb/net/if_kue.c
  projects/cxl_iscsi/sys/dev/usb/net/if_mos.c
  projects/cxl_iscsi/sys/dev/usb/net/if_rue.c
  projects/cxl_iscsi/sys/dev/usb/net/if_smsc.c
  projects/cxl_iscsi/sys/dev/usb/net/if_udav.c
  projects/cxl_iscsi/sys/dev/usb/net/if_urndis.c
  projects/cxl_iscsi/sys/dev/usb/net/if_usie.c
  projects/cxl_iscsi/sys/dev/usb/net/uhso.c
  projects/cxl_iscsi/sys/dev/usb/serial/u3g.c
  projects/cxl_iscsi/sys/dev/usb/serial/uark.c
  projects/cxl_iscsi/sys/dev/usb/serial/ubsa.c
  projects/cxl_iscsi/sys/dev/usb/serial/uchcom.c
  projects/cxl_iscsi/sys/dev/usb/serial/ucycom.c
  projects/cxl_iscsi/sys/dev/usb/serial/ufoma.c
  projects/cxl_iscsi/sys/dev/usb/serial/uftdi.c
  projects/cxl_iscsi/sys/dev/usb/serial/ugensa.c
  projects/cxl_iscsi/sys/dev/usb/serial/uipaq.c
  projects/cxl_iscsi/sys/dev/usb/serial/ulpt.c
  projects/cxl_iscsi/sys/dev/usb/serial/umcs.c
  projects/cxl_iscsi/sys/dev/usb/serial/umct.c
  projects/cxl_iscsi/sys/dev/usb/serial/umodem.c
  projects/cxl_iscsi/sys/dev/usb/serial/umoscom.c
  projects/cxl_iscsi/sys/dev/usb/serial/uplcom.c
  projects/cxl_iscsi/sys/dev/usb/serial/uslcom.c
  projects/cxl_iscsi/sys/dev/usb/serial/uvisor.c
  projects/cxl_iscsi/sys/dev/usb/serial/uvscom.c
  projects/cxl_iscsi/sys/dev/usb/storage/umass.c
  projects/cxl_iscsi/sys/dev/usb/storage/urio.c
  projects/cxl_iscsi/sys/dev/usb/usb_hub.c
  projects/cxl_iscsi/sys/dev/usb/usbdi.h
  projects/cxl_iscsi/sys/dev/usb/wlan/if_rsu.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_rum.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_run.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_uath.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_upgt.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_ural.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_urtw.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwn.c
  projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwnreg.h
  projects/cxl_iscsi/sys/dev/usb/wlan/if_urtwnvar.h
  projects/cxl_iscsi/sys/dev/usb/wlan/if_zyd.c
  projects/cxl_iscsi/sys/dev/wi/if_wi_pccard.c
  projects/cxl_iscsi/sys/dev/wpi/if_wpi.c
  projects/cxl_iscsi/sys/dev/wpi/if_wpi_debug.h
  projects/cxl_iscsi/sys/dev/wtap/if_wtap_module.c
  projects/cxl_iscsi/sys/dev/wtap/if_wtapvar.h
  projects/cxl_iscsi/sys/dev/wtap/plugins/visibility.c
  projects/cxl_iscsi/sys/dev/xe/if_xe_pccard.c
  projects/cxl_iscsi/sys/fs/cuse/cuse.c
  projects/cxl_iscsi/sys/fs/cuse/cuse_ioctl.h
  projects/cxl_iscsi/sys/fs/devfs/devfs_vnops.c
  projects/cxl_iscsi/sys/fs/fuse/fuse_vnops.c
  projects/cxl_iscsi/sys/fs/nfsclient/nfs_clbio.c
  projects/cxl_iscsi/sys/fs/smbfs/smbfs_io.c
  projects/cxl_iscsi/sys/fs/tmpfs/tmpfs_subr.c
  projects/cxl_iscsi/sys/geom/multipath/g_multipath.c
  projects/cxl_iscsi/sys/geom/part/g_part_gpt.c
  projects/cxl_iscsi/sys/i386/i386/initcpu.c
  projects/cxl_iscsi/sys/i386/i386/mp_machdep.c
  projects/cxl_iscsi/sys/i386/i386/pmap.c
  projects/cxl_iscsi/sys/i386/i386/sys_machdep.c
  projects/cxl_iscsi/sys/i386/include/cputypes.h
  projects/cxl_iscsi/sys/i386/include/md_var.h
  projects/cxl_iscsi/sys/i386/include/smp.h
  projects/cxl_iscsi/sys/kern/imgact_elf.c
  projects/cxl_iscsi/sys/kern/kern_exec.c
  projects/cxl_iscsi/sys/kern/kern_exit.c
  projects/cxl_iscsi/sys/kern/kern_fork.c
  projects/cxl_iscsi/sys/kern/kern_jail.c
  projects/cxl_iscsi/sys/kern/kern_linker.c
  projects/cxl_iscsi/sys/kern/kern_malloc.c
  projects/cxl_iscsi/sys/kern/kern_mbuf.c
  projects/cxl_iscsi/sys/kern/kern_proc.c
  projects/cxl_iscsi/sys/kern/kern_racct.c
  projects/cxl_iscsi/sys/kern/kern_rctl.c
  projects/cxl_iscsi/sys/kern/kern_resource.c
  projects/cxl_iscsi/sys/kern/kern_sig.c
  projects/cxl_iscsi/sys/kern/kern_timeout.c
  projects/cxl_iscsi/sys/kern/link_elf.c
  projects/cxl_iscsi/sys/kern/subr_syscall.c
  projects/cxl_iscsi/sys/kern/sys_process.c
  projects/cxl_iscsi/sys/kern/uipc_shm.c
  projects/cxl_iscsi/sys/kern/uipc_syscalls.c
  projects/cxl_iscsi/sys/kern/vfs_bio.c
  projects/cxl_iscsi/sys/kern/vfs_cache.c
  projects/cxl_iscsi/sys/kern/vfs_default.c
  projects/cxl_iscsi/sys/kern/vfs_subr.c
  projects/cxl_iscsi/sys/kern/vnode_if.src
  projects/cxl_iscsi/sys/mips/atheros/apb.c
  projects/cxl_iscsi/sys/mips/atheros/if_arge.c
  projects/cxl_iscsi/sys/mips/atheros/qca953x_chip.c
  projects/cxl_iscsi/sys/mips/conf/RT305X
  projects/cxl_iscsi/sys/mips/include/cpufunc.h
  projects/cxl_iscsi/sys/mips/include/cpuinfo.h
  projects/cxl_iscsi/sys/mips/include/cpuregs.h
  projects/cxl_iscsi/sys/mips/include/ofw_machdep.h
  projects/cxl_iscsi/sys/mips/include/pmap.h
  projects/cxl_iscsi/sys/mips/include/pte.h
  projects/cxl_iscsi/sys/mips/mips/cpu.c
  projects/cxl_iscsi/sys/mips/mips/pm_machdep.c
  projects/cxl_iscsi/sys/mips/mips/pmap.c
  projects/cxl_iscsi/sys/mips/mips/uma_machdep.c
  projects/cxl_iscsi/sys/mips/rt305x/files.rt305x
  projects/cxl_iscsi/sys/mips/rt305x/obio.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_dotg.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_machdep.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305x_sysctl.c
  projects/cxl_iscsi/sys/mips/rt305x/rt305xreg.h
  projects/cxl_iscsi/sys/mips/rt305x/uart_bus_rt305x.c
  projects/cxl_iscsi/sys/mips/rt305x/uart_cpu_rt305x.c
  projects/cxl_iscsi/sys/modules/Makefile
  projects/cxl_iscsi/sys/modules/ahci/Makefile
  projects/cxl_iscsi/sys/modules/cam/Makefile
  projects/cxl_iscsi/sys/modules/geom/geom_sched/Makefile
  projects/cxl_iscsi/sys/modules/ix/Makefile
  projects/cxl_iscsi/sys/modules/ixv/Makefile
  projects/cxl_iscsi/sys/modules/mlx5/Makefile
  projects/cxl_iscsi/sys/modules/mlx5en/Makefile
  projects/cxl_iscsi/sys/net/bpf.c
  projects/cxl_iscsi/sys/net/if.c
  projects/cxl_iscsi/sys/net/if_llatbl.c
  projects/cxl_iscsi/sys/net/if_llatbl.h
  projects/cxl_iscsi/sys/net/if_stf.c
  projects/cxl_iscsi/sys/net/route.c
  projects/cxl_iscsi/sys/net/route.h
  projects/cxl_iscsi/sys/net80211/ieee80211_phy.h
  projects/cxl_iscsi/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c
  projects/cxl_iscsi/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/cxl_iscsi/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
  projects/cxl_iscsi/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  projects/cxl_iscsi/sys/netinet/cc/cc_cubic.c
  projects/cxl_iscsi/sys/netinet/cc/cc_newreno.c
  projects/cxl_iscsi/sys/netinet/if_ether.c
  projects/cxl_iscsi/sys/netinet/in.c
  projects/cxl_iscsi/sys/netinet/in_gif.c
  projects/cxl_iscsi/sys/netinet/in_kdtrace.c
  projects/cxl_iscsi/sys/netinet/in_kdtrace.h
  projects/cxl_iscsi/sys/netinet/in_mcast.c
  projects/cxl_iscsi/sys/netinet/in_rmx.c
  projects/cxl_iscsi/sys/netinet/ip_icmp.c
  projects/cxl_iscsi/sys/netinet/ip_input.c
  projects/cxl_iscsi/sys/netinet/ip_options.c
  projects/cxl_iscsi/sys/netinet/ip_var.h
  projects/cxl_iscsi/sys/netinet/sctp_cc_functions.c
  projects/cxl_iscsi/sys/netinet/sctp_indata.c
  projects/cxl_iscsi/sys/netinet/sctp_input.c
  projects/cxl_iscsi/sys/netinet/sctp_output.c
  projects/cxl_iscsi/sys/netinet/sctp_pcb.c
  projects/cxl_iscsi/sys/netinet/sctp_pcb.h
  projects/cxl_iscsi/sys/netinet/sctp_usrreq.c
  projects/cxl_iscsi/sys/netinet/sctputil.c
  projects/cxl_iscsi/sys/netinet/sctputil.h
  projects/cxl_iscsi/sys/netinet/tcp.h
  projects/cxl_iscsi/sys/netinet/tcp_hostcache.c
  projects/cxl_iscsi/sys/netinet/tcp_hostcache.h
  projects/cxl_iscsi/sys/netinet/tcp_input.c
  projects/cxl_iscsi/sys/netinet/tcp_output.c
  projects/cxl_iscsi/sys/netinet/tcp_sack.c
  projects/cxl_iscsi/sys/netinet/tcp_subr.c
  projects/cxl_iscsi/sys/netinet/tcp_syncache.c
  projects/cxl_iscsi/sys/netinet/tcp_syncache.h
  projects/cxl_iscsi/sys/netinet/tcp_timer.c
  projects/cxl_iscsi/sys/netinet/tcp_usrreq.c
  projects/cxl_iscsi/sys/netinet/tcp_var.h
  projects/cxl_iscsi/sys/netinet/toecore.c
  projects/cxl_iscsi/sys/netinet/udp_usrreq.c
  projects/cxl_iscsi/sys/netinet6/icmp6.c
  projects/cxl_iscsi/sys/netinet6/in6.c
  projects/cxl_iscsi/sys/netinet6/in6_gif.c
  projects/cxl_iscsi/sys/netinet6/in6_mcast.c
  projects/cxl_iscsi/sys/netinet6/in6_rmx.c
  projects/cxl_iscsi/sys/netinet6/in6_src.c
  projects/cxl_iscsi/sys/netinet6/nd6.c
  projects/cxl_iscsi/sys/netinet6/nd6_nbr.c
  projects/cxl_iscsi/sys/netinet6/scope6.c
  projects/cxl_iscsi/sys/netinet6/scope6_var.h
  projects/cxl_iscsi/sys/netinet6/sctp6_usrreq.c
  projects/cxl_iscsi/sys/netpfil/ipfw/ip_dn_io.c
  projects/cxl_iscsi/sys/netpfil/ipfw/ip_dummynet.c
  projects/cxl_iscsi/sys/netpfil/ipfw/ip_fw2.c
  projects/cxl_iscsi/sys/powerpc/booke/booke_machdep.c
  projects/cxl_iscsi/sys/powerpc/booke/pmap.c
  projects/cxl_iscsi/sys/powerpc/booke/trap_subr.S
  projects/cxl_iscsi/sys/powerpc/conf/GENERIC64
  projects/cxl_iscsi/sys/powerpc/include/ofw_machdep.h
  projects/cxl_iscsi/sys/powerpc/include/param.h
  projects/cxl_iscsi/sys/powerpc/include/platform.h
  projects/cxl_iscsi/sys/powerpc/include/pmap.h
  projects/cxl_iscsi/sys/powerpc/include/trap.h
  projects/cxl_iscsi/sys/powerpc/mpc85xx/fsl_sdhc.c
  projects/cxl_iscsi/sys/powerpc/ofw/ofw_machdep.c
  projects/cxl_iscsi/sys/powerpc/powerpc/machdep.c
  projects/cxl_iscsi/sys/powerpc/powerpc/platform.c
  projects/cxl_iscsi/sys/powerpc/powerpc/pmap_dispatch.c
  projects/cxl_iscsi/sys/powerpc/powerpc/trap.c
  projects/cxl_iscsi/sys/powerpc/pseries/phyp_llan.c
  projects/cxl_iscsi/sys/security/audit/bsm_domain.c
  projects/cxl_iscsi/sys/security/audit/bsm_errno.c
  projects/cxl_iscsi/sys/security/audit/bsm_fcntl.c
  projects/cxl_iscsi/sys/security/audit/bsm_socket_type.c
  projects/cxl_iscsi/sys/security/audit/bsm_token.c
  projects/cxl_iscsi/sys/security/mac/mac_framework.c
  projects/cxl_iscsi/sys/security/mac/mac_internal.h
  projects/cxl_iscsi/sys/sys/buf.h
  projects/cxl_iscsi/sys/sys/efi.h
  projects/cxl_iscsi/sys/sys/elf_common.h
  projects/cxl_iscsi/sys/sys/fcntl.h
  projects/cxl_iscsi/sys/sys/libkern.h
  projects/cxl_iscsi/sys/sys/linker.h
  projects/cxl_iscsi/sys/sys/module.h
  projects/cxl_iscsi/sys/sys/param.h
  projects/cxl_iscsi/sys/sys/proc.h
  projects/cxl_iscsi/sys/sys/ptrace.h
  projects/cxl_iscsi/sys/sys/sysent.h
  projects/cxl_iscsi/sys/sys/vnode.h
  projects/cxl_iscsi/sys/ufs/ffs/ffs_softdep.c
  projects/cxl_iscsi/sys/ufs/ufs/ufs_vnops.c
  projects/cxl_iscsi/sys/vm/default_pager.c
  projects/cxl_iscsi/sys/vm/device_pager.c
  projects/cxl_iscsi/sys/vm/phys_pager.c
  projects/cxl_iscsi/sys/vm/sg_pager.c
  projects/cxl_iscsi/sys/vm/swap_pager.c
  projects/cxl_iscsi/sys/vm/uma.h
  projects/cxl_iscsi/sys/vm/uma_core.c
  projects/cxl_iscsi/sys/vm/uma_int.h
  projects/cxl_iscsi/sys/vm/vm_fault.c
  projects/cxl_iscsi/sys/vm/vm_glue.c
  projects/cxl_iscsi/sys/vm/vm_kern.c
  projects/cxl_iscsi/sys/vm/vm_object.c
  projects/cxl_iscsi/sys/vm/vm_object.h
  projects/cxl_iscsi/sys/vm/vm_page.c
  projects/cxl_iscsi/sys/vm/vm_page.h
  projects/cxl_iscsi/sys/vm/vm_pageout.c
  projects/cxl_iscsi/sys/vm/vm_pageout.h
  projects/cxl_iscsi/sys/vm/vm_pager.c
  projects/cxl_iscsi/sys/vm/vm_pager.h
  projects/cxl_iscsi/sys/vm/vm_phys.c
  projects/cxl_iscsi/sys/vm/vm_phys.h
  projects/cxl_iscsi/sys/vm/vm_reserv.c
  projects/cxl_iscsi/sys/vm/vm_reserv.h
  projects/cxl_iscsi/sys/vm/vnode_pager.c
  projects/cxl_iscsi/sys/vm/vnode_pager.h
  projects/cxl_iscsi/sys/x86/include/specialreg.h
  projects/cxl_iscsi/sys/x86/x86/busdma_bounce.c
  projects/cxl_iscsi/sys/x86/x86/identcpu.c
  projects/cxl_iscsi/sys/x86/x86/local_apic.c
  projects/cxl_iscsi/sys/x86/xen/pv.c
  projects/cxl_iscsi/sys/x86/xen/xen_apic.c
  projects/cxl_iscsi/targets/pseudo/gcc/Makefile.depend
  projects/cxl_iscsi/targets/pseudo/universe/Makefile
  projects/cxl_iscsi/tests/freebsd_test_suite/macros.h
  projects/cxl_iscsi/tests/sys/Makefile
  projects/cxl_iscsi/tests/sys/file/flock_test.sh
  projects/cxl_iscsi/tools/bsdbox/Makefile.base
  projects/cxl_iscsi/tools/build/mk/OptionalObsoleteFiles.inc
  projects/cxl_iscsi/tools/build/options/makeman
  projects/cxl_iscsi/tools/debugscripts/README
  projects/cxl_iscsi/tools/regression/tls/ttls2/ttls2.c
  projects/cxl_iscsi/tools/regression/tls/ttls4/ttls4.c
  projects/cxl_iscsi/tools/tools/ath/athratestats/Makefile
  projects/cxl_iscsi/tools/tools/ioat/ioatcontrol.8
  projects/cxl_iscsi/tools/tools/ioat/ioatcontrol.c
  projects/cxl_iscsi/tools/tools/locale/tools/cldr2def.pl
  projects/cxl_iscsi/tools/tools/locale/tools/finalize   (contents, props changed)
  projects/cxl_iscsi/tools/tools/nanobsd/defaults.sh
  projects/cxl_iscsi/tools/tools/nanobsd/nanobsd.sh
  projects/cxl_iscsi/tools/tools/nanobsd/pcengines/ALIX_NFS
  projects/cxl_iscsi/tools/tools/nanobsd/pcengines/common.conf
  projects/cxl_iscsi/usr.bin/bmake/Makefile
  projects/cxl_iscsi/usr.bin/bmake/config.h
  projects/cxl_iscsi/usr.bin/bmake/unit-tests/Makefile
  projects/cxl_iscsi/usr.bin/calendar/calendars/calendar.freebsd
  projects/cxl_iscsi/usr.bin/clang/lldb/Makefile
  projects/cxl_iscsi/usr.bin/clang/lldb/Makefile.depend
  projects/cxl_iscsi/usr.bin/kdump/Makefile
  projects/cxl_iscsi/usr.bin/kdump/Makefile.depend
  projects/cxl_iscsi/usr.bin/kdump/kdump.c
  projects/cxl_iscsi/usr.bin/mkimg/mbr.c
  projects/cxl_iscsi/usr.bin/mkimg/scheme.c
  projects/cxl_iscsi/usr.bin/mkimg/scheme.h
  projects/cxl_iscsi/usr.bin/netstat/ipsec.c
  projects/cxl_iscsi/usr.bin/netstat/main.c
  projects/cxl_iscsi/usr.bin/nfsstat/Makefile
  projects/cxl_iscsi/usr.bin/nfsstat/nfsstat.c
  projects/cxl_iscsi/usr.bin/truss/Makefile
  projects/cxl_iscsi/usr.bin/truss/Makefile.depend.amd64
  projects/cxl_iscsi/usr.bin/truss/syscalls.c
  projects/cxl_iscsi/usr.bin/unzip/unzip.1
  projects/cxl_iscsi/usr.bin/unzip/unzip.c
  projects/cxl_iscsi/usr.bin/vmstat/vmstat.c
  projects/cxl_iscsi/usr.bin/xo/tests/Makefile
  projects/cxl_iscsi/usr.sbin/Makefile
  projects/cxl_iscsi/usr.sbin/Makefile.amd64
  projects/cxl_iscsi/usr.sbin/Makefile.arm
  projects/cxl_iscsi/usr.sbin/Makefile.i386
  projects/cxl_iscsi/usr.sbin/Makefile.powerpc
  projects/cxl_iscsi/usr.sbin/Makefile.sparc64
  projects/cxl_iscsi/usr.sbin/boot0cfg/boot0cfg.c
  projects/cxl_iscsi/usr.sbin/bsdinstall/scripts/netconfig
  projects/cxl_iscsi/usr.sbin/camdd/Makefile
  projects/cxl_iscsi/usr.sbin/cron/cron/do_command.c
  projects/cxl_iscsi/usr.sbin/cron/cron/popen.c
  projects/cxl_iscsi/usr.sbin/cron/crontab/crontab.c
  projects/cxl_iscsi/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/cxl_iscsi/usr.sbin/ctm/ctm/ctm.1
  projects/cxl_iscsi/usr.sbin/iostat/iostat.c
  projects/cxl_iscsi/usr.sbin/jls/Makefile
  projects/cxl_iscsi/usr.sbin/jls/jls.8
  projects/cxl_iscsi/usr.sbin/jls/jls.c
  projects/cxl_iscsi/usr.sbin/kldxref/kldxref.c
  projects/cxl_iscsi/usr.sbin/makefs/makefs.c
  projects/cxl_iscsi/usr.sbin/ndp/ndp.c
  projects/cxl_iscsi/usr.sbin/ofwdump/Makefile.depend
  projects/cxl_iscsi/usr.sbin/pmcstudy/pmcstudy.8
  projects/cxl_iscsi/usr.sbin/pmcstudy/pmcstudy.c
  projects/cxl_iscsi/usr.sbin/sesutil/Makefile
  projects/cxl_iscsi/usr.sbin/sesutil/eltsub.c
  projects/cxl_iscsi/usr.sbin/sesutil/eltsub.h
  projects/cxl_iscsi/usr.sbin/sesutil/sesutil.c
  projects/cxl_iscsi/usr.sbin/uhsoctl/uhsoctl.c
  projects/cxl_iscsi/usr.sbin/ypldap/aldap.c
  projects/cxl_iscsi/usr.sbin/ypldap/ber.c
  projects/cxl_iscsi/usr.sbin/ypldap/ldapclient.c
  projects/cxl_iscsi/usr.sbin/ypldap/ypldap.c
  projects/cxl_iscsi/usr.sbin/ypldap/ypldap_dns.c
  projects/cxl_iscsi/usr.sbin/ypserv/Makefile.yp
Directory Properties:
  projects/cxl_iscsi/   (props changed)
  projects/cxl_iscsi/cddl/   (props changed)
  projects/cxl_iscsi/cddl/contrib/opensolaris/   (props changed)
  projects/cxl_iscsi/contrib/bmake/   (props changed)
  projects/cxl_iscsi/contrib/elftoolchain/   (props changed)
  projects/cxl_iscsi/contrib/gcc/   (props changed)
  projects/cxl_iscsi/contrib/libexecinfo/   (props changed)
  projects/cxl_iscsi/contrib/llvm/   (props changed)
  projects/cxl_iscsi/contrib/llvm/tools/lldb/   (props changed)
  projects/cxl_iscsi/contrib/mdocml/   (props changed)
  projects/cxl_iscsi/contrib/openbsm/   (props changed)
  projects/cxl_iscsi/contrib/top/   (props changed)
  projects/cxl_iscsi/contrib/unbound/   (props changed)
  projects/cxl_iscsi/crypto/openssh/   (props changed)
  projects/cxl_iscsi/gnu/usr.bin/binutils/   (props changed)
  projects/cxl_iscsi/include/   (props changed)
  projects/cxl_iscsi/lib/libc/   (props changed)
  projects/cxl_iscsi/sbin/   (props changed)
  projects/cxl_iscsi/share/   (props changed)
  projects/cxl_iscsi/share/man/man4/   (props changed)
  projects/cxl_iscsi/sys/   (props changed)
  projects/cxl_iscsi/sys/boot/   (props changed)
  projects/cxl_iscsi/sys/cddl/contrib/opensolaris/   (props changed)
  projects/cxl_iscsi/sys/conf/   (props changed)
  projects/cxl_iscsi/sys/contrib/ipfilter/   (props changed)
  projects/cxl_iscsi/sys/dev/hyperv/   (props changed)
  projects/cxl_iscsi/targets/   (props changed)
  projects/cxl_iscsi/usr.bin/calendar/   (props changed)
  projects/cxl_iscsi/usr.bin/mkimg/   (props changed)

Modified: projects/cxl_iscsi/MAINTAINERS
==============================================================================
--- projects/cxl_iscsi/MAINTAINERS	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/MAINTAINERS	Fri Dec 25 01:27:35 2015	(r292713)
@@ -24,133 +24,75 @@ maintainer of a sub-system is to check r
 sub-system.
 ***
 
+***
+Maintainers are encouraged to visit:
+  https://reviews.freebsd.org/herald
+
+and configure notifications for parts of the tree which they maintain.
+Notifications can automatically be sent when someone proposes a revision or
+makes a commit to the specified subtree.
+***
+
 subsystem	login	notes
 -----------------------------
-opencrypto	jmg	Pre-commit review requested.  Documentation Required.
-kqueue		jmg	Pre-commit review requested.  Documentation Required.
-share/mk	imp, bapt, bdrewery, emaste, sjg	Make is hard.
+atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 ath(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-net80211	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
-openssl		benl,jkim	Pre-commit review requested.
-release/release.sh	gjb,re	Pre-commit review and regression tests
-				requested.
-sh(1)		jilles		Pre-commit review requested. This also applies
-				to kill(1), printf(1) and test(1) which are
-				compiled in as builtins.
-isci(4)		jimharris	Pre-commit review requested.
-nvme(4)		jimharris	Pre-commit review requested.
-nvd(4)		jimharris	Pre-commit review requested.
-nvmecontrol(8)	jimharris	Pre-commit review requested.
-libfetch	des	Pre-commit review requested.
-fetch		des	Pre-commit review requested.
-libpam		des	Pre-commit review requested.
-openssh		des	Pre-commit review requested.
-pseudofs	des	Pre-commit review requested.
-procfs		des	Pre-commit review requested.
-linprocfs	des	Pre-commit review requested.
+callout_*(9)	rrs		Pre-commit review requested -- becareful its tricksy code :o.
 contrib/compiler-rt	dim	Pre-commit review preferred.
 contrib/libc++		dim	Pre-commit review preferred.
 contrib/libcxxrt	dim	Pre-commit review preferred.
 contrib/llvm		dim	Pre-commit review preferred.
 contrib/llvm/tools/lldb	emaste	Pre-commit review preferred.
-atf			freebsd-testing,jmmv,ngie	Pre-commit review requested.
 contrib/netbsd-tests	freebsd-testing,ngie	Pre-commit review requested.
 contrib/pjdfstest	freebsd-testing,ngie,pjd	Pre-commit review requested.
+dev/usb/wlan	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+*env(3)		secteam	Due to the problematic security history of this
+			code, please have patches reviewed by secteam.
+etc/mail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+etc/sendmail	gshapiro	Pre-commit review requested.  Keep in sync with -STABLE.
+fetch		des	Pre-commit review requested.
+geli		pjd	Pre-commit review requested (both sys/geom/eli/ and sbin/geom/class/eli/).
+isci(4)		jimharris	Pre-commit review requested.
+iwm(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+iwn(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+kqueue		jmg	Pre-commit review requested.  Documentation Required.
+libfetch	des	Pre-commit review requested.
+libpam		des	Pre-commit review requested.
+linprocfs	des	Pre-commit review requested.
+lpr		gad	Pre-commit review requested, particularly for
+			lpd/recvjob.c and lpd/printjob.c.
+nanobsd		imp	Pre-commit phabricator review requested.
+net80211	adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+nfs		freebsd-fs@FreeBSD.org, rmacklem is best for reviews.
+nis(8), yp(8)	araujo	Pre-commit review requested.
+nvd(4)		jimharris	Pre-commit review requested.
+nvme(4)		jimharris	Pre-commit review requested.
+nvmecontrol(8)	jimharris	Pre-commit review requested.
+opencrypto	jmg	Pre-commit review requested.  Documentation Required.
+openssh		des	Pre-commit review requested.
+openssl		benl,jkim	Pre-commit review requested.
+otus(4)		adrian	Pre-commit review requested, send to freebsd-wireless@freebsd.org
+pci bus		imp,jhb	Pre-commit review requested.
+pmcstudy(8)	rrs		Pre-commit review requested.
+procfs		des	Pre-commit review requested.
+pseudofs	des	Pre-commit review requested.
+release/release.sh	gjb,re	Pre-commit review and regression tests
+				requested.
+sctp		rrs,tuexen	Pre-commit review requested (changes need to be backported to github).
+sendmail	gshapiro	Pre-commit review requested.
+sh(1)		jilles		Pre-commit review requested. This also applies
+				to kill(1), printf(1) and test(1) which are
+				compiled in as builtins.
+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.
-tests			freebsd-testing,ngie	Pre-commit review requested.
-sys/dev/usb	hselasky	If in doubt, ask.
-sys/dev/sound/usb	hselasky	If in doubt, ask.
 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.
 sys/dev/ixl	erj	Pre-commit phabricator review requested.
+sys/dev/sound/usb	hselasky	If in doubt, ask.
+sys/dev/usb	hselasky	If in doubt, ask.
 sys/netinet/ip_carp.c	glebius	Pre-commit review recommended.
 sys/netpfil/pf	kp,glebius	Pre-commit review recommended.
+tests			freebsd-testing,ngie	Pre-commit review requested.
 usr.sbin/pkg	pkg@	Please coordinate behavior or flag changes with pkg team.
-lpr		gad	Pre-commit review requested, particularly for
-			lpd/recvjob.c and lpd/printjob.c.
-nis(8), yp(8)	araujo	Pre-commit review requested.
----- OLD ----
-libc/posix1e	rwatson	Pre-commit review requested.
-POSIX.1e ACLs	rwatson	Pre-commit review requested.
-UFS EAs		rwatson	Pre-commit review requested.
-MAC Framework	rwatson	Pre-commit review requested.
-MAC Modules	rwatson	Pre-commit review requested.
-contrib/openbsm	rwatson	Pre-commit review requested.
-sys/security/audit	rwatson	Pre-commit review requested.
-ahc(4)		gibbs	Pre-commit review requested.
-ahd(4)		gibbs	Pre-commit review requested.
-pci bus		imp,jhb	Pre-commit review requested.
-cdboot		jhb	Pre-commit review requested.
-pxeboot		jhb	Pre-commit review requested.
-witness		jhb	Pre-commit review requested.
-CAM		gibbs,
-		ken	Pre-commit review requested. send to scsi@freebsd.org
-devstat(9)	ken	Pre-commit review requested.
-camcontrol(8)	ken	Pre-commit review requested.
-libcam		ken	Pre-commit review requested.
-libdevstat	ken	Pre-commit review requested.
-iostat(8)	ken	Pre-commit review requested.
-cd(4)		ken	Pre-commit review requested.
-pass(4)		ken	Pre-commit review requested.
-ch(4)		ken	Pre-commit review requested.
-em(4)		jfv	Pre-commit review requested.
-sendmail	gshapiro	Pre-commit review requested.
-etc/mail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
-etc/sendmail	gshapiro	Pre-commit review requested.
-				Keep in sync with -STABLE.
-nvi		peter	Try not to break it.
-libz		peter	Try not to break it.
-groff		ru	Recommends pre-commit review.
-ipfw		ipfw	Pre-commit review preferred. send to ipfw@freebsd.org
-drm		rnoland	Just keep me informed of changes, try not to break it.
-unifdef(1)	fanf	Pre-commit review requested.
-ntp         	roberto	Pre-commit review requested.
-inetd		dwmalone	Recommends pre-commit review.
-contrib/smbfs	bp	Open for in-tree committs. In case of functional
-			changes pre-commit review requested.
-file		obrien	Insists to keep file blocked from other's unapproved
-			commits
-contrib/bzip2	obrien	Pre-commit review required.
-geom		freebsd-geom@FreeBSD.org
-geom_concat	pjd	Pre-commit review preferred.
-geom_eli	pjd	Pre-commit review preferred.
-geom_gate	pjd	Pre-commit review preferred.
-geom_label	pjd	Pre-commit review preferred.
-geom_mirror	pjd	Pre-commit review preferred.
-geom_nop	pjd	Pre-commit review preferred.
-geom_raid3	pjd	Pre-commit review preferred.
-geom_shsec	pjd	Pre-commit review preferred.
-geom_stripe	pjd	Pre-commit review preferred.
-geom_zero	pjd	Pre-commit review preferred.
-sbin/geom	pjd	Pre-commit review preferred.
-zfs		freebsd-fs@FreeBSD.org
-nfs		freebsd-fs@FreeBSD.org, rmacklem is best for reviews.
-linux emul	emulation	Please discuss changes here.
-bs{diff,patch}	cperciva	Pre-commit review requested.
-portsnap	cperciva	Pre-commit review requested.
-freebsd-update	cperciva	Pre-commit review requested.
-sys/netgraph/bluetooth	emax	Pre-commit review preferred.
-lib/libbluetooth	emax	Pre-commit review preferred.
-lib/libsdp		emax	Pre-commit review preferred.
-usr.bin/bluetooth	emax	Pre-commit review preferred.
-usr.sbin/bluetooth	emax	Pre-commit review preferred.
-*env(3)		secteam	Due to the problematic security history of this
-			code, please have patches reviewed by secteam.
-share/zoneinfo		edwin	Heads-up appreciated, since our data is coming
-				from a third party source.
-usr.sbin/zic		edwin   Heads-up appreciated, since this code is
-				maintained by a third party source.
-lib/libc/stdtime	edwin   Heads-up appreciated, since parts of this code
-				is maintained by a third party source.
-sbin/routed	bms	Pre-commit review; notify vendor at rhyolite.com
-cmx		daniel@roe.ch	Pre-commit review preferred.
-filemon		obrien		Pre-commit review preferred.
-sysdoc		trhodes		Pre-commit review preferred.
-nanobsd		imp	Pre-commit review requested for coordination.
 vmm(4)		neel,grehan	Pre-commit review requested.

Modified: projects/cxl_iscsi/Makefile
==============================================================================
--- projects/cxl_iscsi/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -57,8 +57,8 @@
 # Makefile.inc1.  The exceptions are universe, tinderbox and targets.
 #
 # If you want to build your system from source be sure that /usr/obj has
-# at least 1GB of diskspace available.  A complete 'universe' build requires
-# about 15GB of space.
+# at least 6GB of diskspace available.  A complete 'universe' build requires
+# about 100GB of space.
 #
 # For individuals wanting to build from the sources currently on their
 # system, the simple instructions are:
@@ -180,7 +180,7 @@ _MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makef
 _TARGET_ARCH=	${TARGET:S/pc98/i386/:S/arm64/aarch64/}
 .elif !defined(TARGET) && defined(TARGET_ARCH) && \
     ${TARGET_ARCH} != ${MACHINE_ARCH}
-_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/}
+_TARGET=		${TARGET_ARCH:C/mips(n32|64)?(el)?/mips/:C/arm(v6)?(eb|hf)?/arm/:C/aarch64/arm64/:C/powerpc64/powerpc/:C/riscv64/riscv/}
 .endif
 .if defined(TARGET) && !defined(_TARGET)
 _TARGET=${TARGET}

Modified: projects/cxl_iscsi/Makefile.inc1
==============================================================================
--- projects/cxl_iscsi/Makefile.inc1	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/Makefile.inc1	Fri Dec 25 01:27:35 2015	(r292713)
@@ -48,10 +48,11 @@
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
 
+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)
-LOCALBASE?=	/usr/local
 .include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
 CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}"
 .endif
@@ -146,7 +147,11 @@ CLEANDIR=	cleandir
 LOCAL_TOOL_DIRS?=
 PACKAGEDIR?=	${DESTDIR}/${DISTDIR}
 
+.if empty(SHELL:M*csh*)
 BUILDENV_SHELL?=${SHELL}
+.else
+BUILDENV_SHELL?=/bin/sh
+.endif
 
 SVN?=		/usr/local/bin/svn
 SVNFLAGS?=	-r HEAD
@@ -163,7 +168,7 @@ OSRELDATE=	0
 .endif
 
 # Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION.
-.if !defined(VERSION)
+.if !defined(VERSION) && !make(showconfig)
 REVISION!=	${MAKE} -C ${SRCDIR}/release -V REVISION
 BRANCH!=	${MAKE} -C ${SRCDIR}/release -V BRANCH
 SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
@@ -172,7 +177,25 @@ VERSION=	FreeBSD ${REVISION}-${BRANCH:C/
 .export VERSION
 .endif
 
-KNOWN_ARCHES?=	aarch64/arm64 amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	aarch64/arm64 \
+		amd64 \
+		arm \
+		armeb/arm \
+		armv6/arm \
+		armv6hf/arm \
+		i386 \
+		i386/pc98 \
+		mips \
+		mipsel/mips \
+		mips64el/mips \
+		mips64/mips \
+		mipsn32el/mips \
+		mipsn32/mips \
+		powerpc \
+		powerpc64/powerpc \
+		riscv64/riscv \
+		sparc64
+
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -195,11 +218,14 @@ _TARGET_CPUTYPE=${TARGET_CPUTYPE}
 .else
 _TARGET_CPUTYPE=dummy
 .endif
+# Skip for showconfig as it is just wasted time and may invoke auto.obj.mk.
+.if !make(showconfig)
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \
 		-f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE
 .if ${_CPUTYPE} != ${_TARGET_CPUTYPE}
 .error CPUTYPE global should be set with ?=.
 .endif
+.endif
 .if make(buildworld)
 BUILD_ARCH!=	uname -p
 .if ${MACHINE_ARCH} != ${BUILD_ARCH}
@@ -666,7 +692,7 @@ everything:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 4.4: building everything"
 	@echo "--------------------------------------------------------------"
-	${_+_}cd ${.CURDIR}; _PARALLEL_SUBUDIR_OK=1 ${WMAKE} all
+	${_+_}cd ${.CURDIR}; _PARALLEL_SUBDIR_OK=1 ${WMAKE} all
 .if defined(LIB32TMP)
 build32: .PHONY
 	@echo
@@ -1289,7 +1315,7 @@ packagekernel:
 # Build the API documentation with doxygen
 #
 doxygen: .PHONY
-	@if [ ! -x `/usr/bin/which doxygen` ]; then \
+	@if [ ! -x ${LOCALBASE}/bin/doxygen ]; then \
 		echo "You need doxygen (devel/doxygen) to generate the API documentation of the kernel." | /usr/bin/fmt; \
 		exit 1; \
 	fi
@@ -1651,7 +1677,7 @@ NXBMAKE=	${NXBENV} ${MAKE} \
 		-DNO_PIC MK_PROFILE=no -DNO_SHARED \
 		-DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
 		MK_CLANG_EXTRAS=no MK_CLANG_FULL=no \
-		MK_LLDB=no
+		MK_LLDB=no MK_DEBUG_FILES=no
 
 # native-xtools is the current target for qemu-user cross builds of ports
 # via poudriere and the imgact_binmisc kernel module.
@@ -2008,14 +2034,14 @@ _prebuild_libs: ${_prebuild_libs:S/$/__L
 _generic_libs: ${_generic_libs:S/$/__L/}
 
 # Enable SUBDIR_PARALLEL when not calling 'make all', unless called from
-# 'everything' with _PARALLEL_SUBUDIR_OK set.  This is because it is unlikely
+# 'everything' with _PARALLEL_SUBDIR_OK set.  This is because it is unlikely
 # that running 'make all' from the top-level, especially with a SUBDIR_OVERRIDE
 # or LOCAL_DIRS set, will have a reliable build if SUBDIRs are built in
 # parallel.  This is safe for the world stage of buildworld though since it has
 # already built libraries in a proper order and installed includes into
 # WORLDTMP. Special handling is done for SUBDIR ordering for 'install*' to
 # avoid trashing a system if it crashes mid-install.
-.if !make(all) || defined(_PARALLEL_SUBUDIR_OK)
+.if !make(all) || defined(_PARALLEL_SUBDIR_OK)
 SUBDIR_PARALLEL=
 .endif
 

Modified: projects/cxl_iscsi/UPDATING
==============================================================================
--- projects/cxl_iscsi/UPDATING	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/UPDATING	Fri Dec 25 01:27:35 2015	(r292713)
@@ -31,6 +31,27 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20151216:
+	The tftp loader (pxeboot) now uses the option root-path directive. As a
+	consequence it no longer looks for a pxeboot.4th file on the tftp
+	server. Instead it uses the regular /boot infrastructure as with the
+	other loaders.
+
+20151211:
+	The code to start recording plug and play data into the modules has
+	been committed. While the old tools will properly build a new kernel,
+	a number of warnings about "unknown metadata record 4" will be produced
+	for an older kldxref. To avoid such warnings, make sure to rebuild
+	the kernel toolchain (or world). Make sure that you have r292078 or
+	later when trying to build 292077 or later before rebuilding.
+
+20151207:
+	Debug data files are now built by default with 'make buildworld' and
+	installed with 'make installworld'. This facilitates debugging but
+	requires more disk space both during the build and for the installed
+	world. Debug files may be disabled by setting WITHOUT_DEBUG_FILES=yes
+	in src.conf(5).
+
 20151130:
 	r291527 changed the internal interface between the nfsd.ko and
 	nfscommon.ko modules. As such, they must both be upgraded to-gether.

Modified: projects/cxl_iscsi/bin/ed/main.c
==============================================================================
--- projects/cxl_iscsi/bin/ed/main.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/ed/main.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -505,7 +505,8 @@ exec_command(void)
 			return ERR;
 		else if (open_sbuf() < 0)
 			return FATAL;
-		if (*fnp && *fnp != '!') strcpy(old_filename, fnp);
+		if (*fnp && *fnp != '!')
+			 strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";
@@ -532,7 +533,8 @@ exec_command(void)
 			return ERR;
 		}
 		GET_COMMAND_SUFFIX();
-		if (*fnp) strcpy(old_filename, fnp);
+		if (*fnp)
+			strlcpy(old_filename, fnp, PATH_MAX);
 		printf("%s\n", strip_escapes(old_filename));
 		break;
 	case 'g':
@@ -663,7 +665,7 @@ exec_command(void)
 		GET_COMMAND_SUFFIX();
 		if (!isglobal) clear_undo_stack();
 		if (*old_filename == '\0' && *fnp != '!')
-			strcpy(old_filename, fnp);
+			strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";
@@ -797,7 +799,7 @@ exec_command(void)
 			return ERR;
 		GET_COMMAND_SUFFIX();
 		if (*old_filename == '\0' && *fnp != '!')
-			strcpy(old_filename, fnp);
+			strlcpy(old_filename, fnp, PATH_MAX);
 #ifdef BACKWARDS
 		if (*fnp == '\0' && *old_filename == '\0') {
 			errmsg = "no current filename";

Modified: projects/cxl_iscsi/bin/freebsd-version/Makefile
==============================================================================
--- projects/cxl_iscsi/bin/freebsd-version/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/freebsd-version/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -2,7 +2,7 @@
 
 SCRIPTS = freebsd-version
 MAN = freebsd-version.1
-CLEANFILES = freebsd-version.sh
+CLEANFILES = freebsd-version freebsd-version.sh
 NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
 
 freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}

Modified: projects/cxl_iscsi/bin/ls/print.c
==============================================================================
--- projects/cxl_iscsi/bin/ls/print.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/ls/print.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -47,12 +47,14 @@ __FBSDID("$FreeBSD$");
 #include <fts.h>
 #include <langinfo.h>
 #include <libutil.h>
+#include <limits.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <wchar.h>
 #ifdef COLORLS
 #include <ctype.h>
 #include <termcap.h>
@@ -105,6 +107,9 @@ static struct {
 } colors[C_NUMCOLORS];
 #endif
 
+static size_t padding_for_month[12];
+static size_t month_max_size = 0;
+
 void
 printscol(const DISPLAY *dp)
 {
@@ -138,6 +143,70 @@ printname(const char *field, const char 
 	return rc;
 }
 
+static const char *
+get_abmon(int mon)
+{
+
+	switch (mon) {
+	case 0: return (nl_langinfo(ABMON_1));
+	case 1: return (nl_langinfo(ABMON_2));
+	case 2: return (nl_langinfo(ABMON_3));
+	case 3: return (nl_langinfo(ABMON_4));
+	case 4: return (nl_langinfo(ABMON_5));
+	case 5: return (nl_langinfo(ABMON_6));
+	case 6: return (nl_langinfo(ABMON_7));
+	case 7: return (nl_langinfo(ABMON_8));
+	case 8: return (nl_langinfo(ABMON_9));
+	case 9: return (nl_langinfo(ABMON_10));
+	case 10: return (nl_langinfo(ABMON_11));
+	case 11: return (nl_langinfo(ABMON_12));
+	}
+
+	/* should never happen */
+	abort();
+}
+
+static size_t
+mbswidth(const char *month)
+{
+	wchar_t wc;
+	size_t width, donelen, clen, w;
+
+	width = donelen = 0;
+	while ((clen = mbrtowc(&wc, month + donelen, MB_LEN_MAX, NULL)) != 0) {
+		if (clen == (size_t)-1 || clen == (size_t)-2)
+			return (-1);
+		donelen += clen;
+		if ((w = wcwidth(wc)) == (size_t)-1)
+			return (-1);
+		width += w;
+	}
+
+	return (width);
+}
+
+static void
+compute_abbreviated_month_size(void)
+{
+	int i;
+	size_t width;
+	size_t months_width[12];
+
+	for (i = 0; i < 12; i++) {
+		width = mbswidth(get_abmon(i));
+		if (width == (size_t)-1) {
+			month_max_size = -1;
+			return;
+		}
+		months_width[i] = width;
+		if (width > month_max_size)
+			month_max_size = width;
+	}
+
+	for (i = 0; i < 12; i++)
+		padding_for_month[i] = month_max_size - months_width[i];
+}
+
 /*
  * print name in current style
  */
@@ -425,6 +494,31 @@ printdev(size_t width, dev_t dev)
 	xo_emit("{:device/%#*jx} ", (u_int)width, (uintmax_t)dev);
 }
 
+static size_t
+ls_strftime(char *str, size_t len, const char *fmt, const struct tm *tm)
+{
+	char *posb, nfmt[BUFSIZ];
+	const char *format = fmt;
+	size_t ret;
+
+	if ((posb = strstr(fmt, "%b")) != NULL) {
+		if (month_max_size == 0) {
+			compute_abbreviated_month_size();
+		}
+		if (month_max_size > 0) {
+			snprintf(nfmt, sizeof(nfmt),  "%.*s%s%*s%s",
+			    (int)(posb - fmt), fmt,
+			    get_abmon(tm->tm_mon),
+			    (int)padding_for_month[tm->tm_mon],
+			    "",
+			    posb + 2);
+			format = nfmt;
+		}
+	}
+	ret = strftime(str, len, format, tm);
+	return (ret);
+}
+
 static void
 printtime(const char *field, time_t ftime)
 {
@@ -451,7 +545,7 @@ printtime(const char *field, time_t ftim
 	else
 		/* mmm dd  yyyy || dd mmm  yyyy */
 		format = d_first ? "%e %b  %Y" : "%b %e  %Y";
-	strftime(longstring, sizeof(longstring), format, localtime(&ftime));
+	ls_strftime(longstring, sizeof(longstring), format, localtime(&ftime));
 
 	snprintf(fmt, sizeof(fmt), "{d:%s/%%hs} ", field);
 	xo_attr("value", "%ld", (long) ftime);

Modified: projects/cxl_iscsi/bin/ls/tests/ls_tests.sh
==============================================================================
--- projects/cxl_iscsi/bin/ls/tests/ls_tests.sh	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/ls/tests/ls_tests.sh	Fri Dec 25 01:27:35 2015	(r292713)
@@ -170,8 +170,6 @@ B_flag_head()
 
 B_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\013z' -s exit:0 ls -B
 }
@@ -467,8 +465,6 @@ b_flag_head()
 
 b_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	atf_check -e empty -o empty -s exit:0 touch "$(printf "y\013z")"
 	atf_check -e empty -o match:'y\\vz' -s exit:0 ls -b
 }
@@ -747,8 +743,6 @@ q_flag_and_w_flag_head()
 
 q_flag_and_w_flag_body()
 {
-	atf_skip "kyua report-jenkins doesn't properly escape non-printable chars: https://github.com/jmmv/kyua/issues/136"
-
 	create_test_dir
 
 	test_file="$(printf "y\01z")"

Modified: projects/cxl_iscsi/bin/sh/mknodes.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/mknodes.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/sh/mknodes.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -89,7 +89,6 @@ static struct str *nodestr[MAXTYPES];	/*
 static int nstr;			/* number of structures */
 static struct str str[MAXTYPES];	/* the structures */
 static struct str *curstr;		/* current structure */
-static FILE *infp;
 static char line[1024];
 static int linno;
 static char *linep;
@@ -102,7 +101,7 @@ static void outfunc(FILE *, int);
 static void indent(int, FILE *);
 static int nextfield(char *);
 static void skipbl(void);
-static int readline(void);
+static int readline(FILE *);
 static void error(const char *, ...) __printf0like(1, 2) __dead2;
 static char *savestr(const char *);
 
@@ -110,17 +109,19 @@ static char *savestr(const char *);
 int
 main(int argc, char *argv[])
 {
+	FILE *infp;
+
 	if (argc != 3)
 		error("usage: mknodes file");
-	infp = stdin;
 	if ((infp = fopen(argv[1], "r")) == NULL)
 		error("Can't open %s: %s", argv[1], strerror(errno));
-	while (readline()) {
+	while (readline(infp)) {
 		if (line[0] == ' ' || line[0] == '\t')
 			parsefield();
 		else if (line[0] != '\0')
 			parsenode();
 	}
+	fclose(infp);
 	output(argv[2]);
 	exit(0);
 }
@@ -253,6 +254,10 @@ output(char *file)
 	fputs("union node *getfuncnode(struct funcdef *);\n", hfile);
 	fputs("void reffunc(struct funcdef *);\n", hfile);
 	fputs("void unreffunc(struct funcdef *);\n", hfile);
+	if (ferror(hfile))
+		error("Can't write to nodes.h");
+	if (fclose(hfile))
+		error("Can't close nodes.h");
 
 	fputs(writer, cfile);
 	while (fgets(line, sizeof line, patfile) != NULL) {
@@ -266,6 +271,11 @@ output(char *file)
 		else
 			fputs(line, cfile);
 	}
+	fclose(patfile);
+	if (ferror(cfile))
+		error("Can't write to nodes.c");
+	if (fclose(cfile))
+		error("Can't close nodes.c");
 }
 
 
@@ -401,7 +411,7 @@ skipbl(void)
 
 
 static int
-readline(void)
+readline(FILE *infp)
 {
 	char *p;
 

Modified: projects/cxl_iscsi/bin/sh/tests/parameters/Makefile
==============================================================================
--- projects/cxl_iscsi/bin/sh/tests/parameters/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/sh/tests/parameters/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -20,6 +20,8 @@ FILES+=		positional4.0
 FILES+=		positional5.0
 FILES+=		positional6.0
 FILES+=		positional7.0
+FILES+=		positional8.0
+FILES+=		positional9.0
 FILES+=		pwd1.0
 FILES+=		pwd2.0
 

Copied: projects/cxl_iscsi/bin/sh/tests/parameters/positional9.0 (from r292712, head/bin/sh/tests/parameters/positional9.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/cxl_iscsi/bin/sh/tests/parameters/positional9.0	Fri Dec 25 01:27:35 2015	(r292713, copy of r292712, head/bin/sh/tests/parameters/positional9.0)
@@ -0,0 +1,18 @@
+# $FreeBSD$
+# Although POSIX leaves the result of expanding ${#@} and ${#*} unspecified,
+# make sure it is at least numeric.
+
+set -- bb cc ddd
+set -f
+lengths=${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+IFS=
+lengths=$lengths${#*}${#@}"${#*}${#@}"$(echo ${#*}${#@}"${#*}${#@}")
+case $lengths in
+*[!0-9]*)
+	printf 'bad: %s\n' "$lengths"
+	exit 3 ;;
+????????????????*) ;;
+*)
+	printf 'too short: %s\n' "$lengths"
+	exit 3 ;;
+esac

Modified: projects/cxl_iscsi/bin/sh/var.c
==============================================================================
--- projects/cxl_iscsi/bin/sh/var.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/bin/sh/var.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -330,7 +330,7 @@ setvareq(char *s, int flags)
 		if (vp->flags & VREADONLY) {
 			if ((flags & (VTEXTFIXED|VSTACK)) == 0)
 				ckfree(s);
-			error("%.*s: is read only", vp->name_len, s);
+			error("%.*s: is read only", vp->name_len, vp->text);
 		}
 		if (flags & VNOSET) {
 			if ((flags & (VTEXTFIXED|VSTACK)) == 0)

Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out	Fri Dec 25 01:27:35 2015	(r292713)
@@ -1,2 +1,3 @@
 Sun, 25 Jan 2004 13:00:00 PST
 2004 Jan 25 13:00:00
+

Copied: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh (from r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh	Fri Dec 25 01:27:35 2015	(r292713, copy of r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh)
@@ -0,0 +1,99 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2015, Joyent, Inc. All rights reserved.
+#
+
+#
+# This test assures that we can have the same provider name across multiple
+# probe definitions, and that the result will be the union of those
+# definitions.  In particular, libusdt depends on this when (for example)
+# node modules that create a provider are loaded multiple times due to
+# being included by different modules.
+#
+
+if [ $# != 1 ]; then
+	echo expected one argument: '<'dtrace-path'>'
+	exit 2
+fi
+
+dtrace=$1
+DIR=/var/tmp/dtest.$$
+
+mkdir $DIR
+cd $DIR
+
+cat > test.c <<EOF
+#include <unistd.h>
+
+void
+main()
+{
+EOF
+
+objs=
+
+for oogle in bagnoogle stalloogle cockoogle; do
+	cat > $oogle.c <<EOF
+#include <sys/sdt.h>
+
+void
+$oogle()
+{
+	DTRACE_PROBE(doogle, $oogle);
+}
+EOF
+
+	cat > $oogle.d <<EOF
+provider doogle {
+	probe $oogle();
+};
+EOF
+
+	cc -c $oogle.c
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to compile $oogle.c"
+		exit 1
+	fi
+
+	$dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
+
+	if [ $? -ne 0 ]; then
+		print -u2 "failed to process $oogle.d"
+		exit 1
+	fi
+
+	objs="$objs $oogle.o $oogle.d.o"
+	echo $oogle'();' >> test.c
+done
+
+echo "}" >> test.c
+
+cc -o test test.c $objs
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to compile test.c"
+	exit 1
+fi
+
+$dtrace -n 'doogle$target:::{@[probename] = count()}' \
+    -n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test
+
+if [ $? -ne 0 ]; then
+	print -u2 "failed to execute test"
+	exit 1
+fi
+
+cd /
+rm -rf $DIR
+exit 0

Copied: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out (from r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out	Fri Dec 25 01:27:35 2015	(r292713, copy of r292712, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.sameprovmulti.ksh.out)
@@ -0,0 +1,4 @@
+bagnoogle  1
+cockoogle  1
+stalloogle 1
+

Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -3657,7 +3657,8 @@ main(int argc, char **argv)
 
 	kernel_init(FREAD);
 	g_zfs = libzfs_init();
-	ASSERT(g_zfs != NULL);
+	if (g_zfs == NULL)
+		fatal("Fail to initialize zfs");
 
 	if (dump_all)
 		verbose = MAX(verbose, 1);

Modified: projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
==============================================================================
--- projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c	Fri Dec 25 01:27:35 2015	(r292713)
@@ -571,12 +571,6 @@ dt_pid_usdt_mapping(void *data, const pr
 	prsyminfo_t sip;
 	dof_helper_t dh;
 	GElf_Half e_type;
-#ifdef __FreeBSD__
-	dof_hdr_t hdr;
-	size_t sz;
-	uint64_t dofmax;
-	void *dof;
-#endif
 	const char *mname;
 	const char *syms[] = { "___SUNW_dof", "__SUNW_dof" };
 	int i, fd = -1;
@@ -606,61 +600,25 @@ dt_pid_usdt_mapping(void *data, const pr
 			continue;
 		}
 
-#ifdef __FreeBSD__
+		dh.dofhp_dof = sym.st_value;
 		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-		if (Pread(P, &hdr, sizeof (hdr), sym.st_value) !=
-		    sizeof (hdr)) {
-			dt_dprintf("read of DOF header failed\n");
-			continue;
-		}
-
-		sz = sizeof(dofmax);
-		if (sysctlbyname("kern.dtrace.dof_maxsize", &dofmax, &sz,
-		    NULL, 0) != 0) {
-			dt_dprintf("failed to read dof_maxsize: %s\n",
-			    strerror(errno));
-			continue;
-		}
-		if (dofmax < hdr.dofh_loadsz) {
-			dt_dprintf("DOF load size exceeds maximum\n");
-			continue;
-		}
-
-		if ((dof = malloc(hdr.dofh_loadsz)) == NULL)
-			return (-1);
-
-		if (Pread(P, dof, hdr.dofh_loadsz, sym.st_value) !=
-		    hdr.dofh_loadsz) {
-			free(dof);
-			dt_dprintf("read of DOF section failed\n");
-			continue;
-		}
-
-		dh.dofhp_dof = (uintptr_t)dof;
-		dh.dofhp_pid = proc_getpid(P);
 
 		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
 		    sip.prs_lmid, mname);
 
+#ifdef __FreeBSD__
+		dh.dofhp_pid = proc_getpid(P);
+
 		if (fd == -1 &&
 		    (fd = open("/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("open of helper device failed: %s\n",
 			    strerror(errno));
-			free(dof);
 			return (-1); /* errno is set for us */
 		}
 
 		if (ioctl(fd, DTRACEHIOC_ADDDOF, &dh, sizeof (dh)) < 0)
 			dt_dprintf("DOF was rejected for %s\n", dh.dofhp_mod);
-
-		free(dof);
 #else
-		dh.dofhp_dof = sym.st_value;
-		dh.dofhp_addr = (e_type == ET_EXEC) ? 0 : pmp->pr_vaddr;
-
-		dt_pid_objname(dh.dofhp_mod, sizeof (dh.dofhp_mod),
-		    sip.prs_lmid, mname);
-
 		if (fd == -1 &&
 		    (fd = pr_open(P, "/dev/dtrace/helper", O_RDWR, 0)) < 0) {
 			dt_dprintf("pr_open of helper device failed: %s\n",

Modified: projects/cxl_iscsi/cddl/sbin/zfs/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/sbin/zfs/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/sbin/zfs/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -22,6 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 
-LIBADD=	geom jail nvpair umem util uutil zfs_core zfs
+LIBADD=	jail nvpair uutil zfs_core zfs
 
 .include <bsd.prog.mk>

Modified: projects/cxl_iscsi/cddl/sbin/zpool/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/sbin/zpool/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/sbin/zpool/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -27,6 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
 
-LIBADD=	avl geom nvpair umem util uutil zfs_core zfs
+LIBADD=	geom nvpair uutil zfs
 
 .include <bsd.prog.mk>

Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/proc/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -24,6 +24,6 @@ CFILES= \
      tst.sigwait.c  \
 
 
-LIBADD.tst.sigwait.exe=rt
+LIBADD.tst.sigwait.exe+= rt
 
 .include "../../dtrace.test.mk"

Modified: projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/usr.sbin/dtrace/tests/common/usdt/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -46,6 +46,8 @@ TESTFILES= \
      tst.onlyenabled.ksh  \
      tst.reap.ksh  \
      tst.reeval.ksh  \
+     tst.sameprovmulti.ksh  \
+     tst.sameprovmulti.ksh.out  \
      tst.static.ksh  \
      tst.static.ksh.out  \
      tst.static2.ksh  \

Modified: projects/cxl_iscsi/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/zdb/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/usr.sbin/zdb/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -24,7 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair umem uutil zfs zpool
 
 # Since there are many asserts in this program, it makes no sense to compile
 # it without debugging.

Modified: projects/cxl_iscsi/cddl/usr.sbin/zhack/Makefile
==============================================================================
--- projects/cxl_iscsi/cddl/usr.sbin/zhack/Makefile	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/cddl/usr.sbin/zhack/Makefile	Fri Dec 25 01:27:35 2015	(r292713)
@@ -23,7 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair zfs zpool
 
 CFLAGS+=	-DDEBUG=1
 #DEBUG_FLAGS+=	-g

Modified: projects/cxl_iscsi/contrib/bmake/ChangeLog
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/ChangeLog	Fri Dec 25 00:58:41 2015	(r292712)
+++ projects/cxl_iscsi/contrib/bmake/ChangeLog	Fri Dec 25 01:27:35 2015	(r292713)
@@ -1,3 +1,35 @@
+2015-12-01  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151201
+	  Merge with NetBSD make, pick up
+	  o cond.c: CondCvtArg: avoid access beyond end of empty buffer.
+	  o meta.c: meta_oodate: use lstat(2) for checking link target
+	    in case it is a symlink.
+	  o var.c: avoid calling brk_string and Var_Export1 with empty
+	    strings.
+	
+2015-11-26  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151126
+	  Merge with NetBSD make, pick up
+	  o parse.c: ParseTrackInput don't access beyond 
+	    end of old value.
+	
+2015-10-22  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151022
+
+	* Add support for BSD/OS which lacks inttypes.h
+	  and really needs sys/param.h for sys/sysctl.h
+	  also 'type' is not a shell builtin.
+
+	* var.c: eliminate uint32_t and need for inttypes.h
+	
+	* main.c: PrintOnError flush stdout before run .ERROR

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

From owner-svn-src-projects@freebsd.org  Fri Dec 25 02:15:28 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A861A51C98
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Fri, 25 Dec 2015 02:15:28 +0000 (UTC) (envelope-from np@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 mx1.freebsd.org (Postfix) with ESMTPS id EC4E611AF;
 Fri, 25 Dec 2015 02:15:27 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBP2FRSN097391;
 Fri, 25 Dec 2015 02:15:27 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBP2FRkZ097390;
 Fri, 25 Dec 2015 02:15:27 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201512250215.tBP2FRkZ097390@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Fri, 25 Dec 2015 02:15:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292714 - projects/cxl_iscsi/sys/dev/iscsi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Dec 2015 02:15:28 -0000

Author: np
Date: Fri Dec 25 02:15:26 2015
New Revision: 292714
URL: https://svnweb.freebsd.org/changeset/base/292714

Log:
  Remove unused experimental items from icl.h to eliminate differences with head.

Modified:
  projects/cxl_iscsi/sys/dev/iscsi/icl.h

Modified: projects/cxl_iscsi/sys/dev/iscsi/icl.h
==============================================================================
--- projects/cxl_iscsi/sys/dev/iscsi/icl.h	Fri Dec 25 01:27:35 2015	(r292713)
+++ projects/cxl_iscsi/sys/dev/iscsi/icl.h	Fri Dec 25 02:15:26 2015	(r292714)
@@ -80,7 +80,6 @@ struct icl_pdu {
 	uint32_t		ip_prv0;
 	uint32_t		ip_prv1;
 	uint32_t		ip_prv2;
-	uint32_t                ip_ofld_prv0;/* indicate iscsi-inititor that data is DDP'ed */
 };
 
 #define ICL_CONN_STATE_INVALID		0
@@ -123,7 +122,6 @@ struct icl_conn {
 	 * User (initiator or provider) private fields.
 	 */
 	void			*ic_prv0;
-	void			*ic_ofld_prv0;
 };
 
 struct icl_conn	*icl_new_conn(const char *offload, const char *name,

From owner-svn-src-projects@freebsd.org  Sat Dec 26 00:31:24 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 275A8A52A35
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 26 Dec 2015 00:31:24 +0000 (UTC) (envelope-from np@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 mx1.freebsd.org (Postfix) with ESMTPS id D01C41E3A;
 Sat, 26 Dec 2015 00:31:23 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQ0VMFK000406;
 Sat, 26 Dec 2015 00:31:22 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQ0VJoB000370;
 Sat, 26 Dec 2015 00:31:19 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201512260031.tBQ0VJoB000370@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 26 Dec 2015 00:31:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292737 - in projects/cxl_iscsi: . contrib/bmake
 contrib/bmake/mk contrib/llvm/include/llvm-c
 contrib/llvm/include/llvm/CodeGen contrib/llvm/lib/CodeGen/AsmPrinter
 contrib/llvm/lib/Code...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Dec 2015 00:31:24 -0000

Author: np
Date: Sat Dec 26 00:31:19 2015
New Revision: 292737
URL: https://svnweb.freebsd.org/changeset/base/292737

Log:
  Last catchup with head.

Added:
  projects/cxl_iscsi/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff
     - copied unchanged from r292736, head/contrib/llvm/patches/patch-08-clang-cc1as-dwarf2.diff
Deleted:
  projects/cxl_iscsi/contrib/llvm/patches/patch-08-llvm-r250085-fix-avx-crash.diff
  projects/cxl_iscsi/contrib/llvm/patches/patch-09-clang-r250657-openmp.diff
  projects/cxl_iscsi/contrib/llvm/patches/patch-10-clang-cc1as-dwarf2.diff
Modified:
  projects/cxl_iscsi/ObsoleteFiles.inc
  projects/cxl_iscsi/contrib/bmake/ChangeLog
  projects/cxl_iscsi/contrib/bmake/Makefile
  projects/cxl_iscsi/contrib/bmake/mk/ChangeLog
  projects/cxl_iscsi/contrib/bmake/mk/auto.obj.mk
  projects/cxl_iscsi/contrib/bmake/mk/install-mk
  projects/cxl_iscsi/contrib/bmake/os.sh
  projects/cxl_iscsi/contrib/bmake/suff.c
  projects/cxl_iscsi/contrib/llvm/include/llvm-c/Core.h
  projects/cxl_iscsi/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
  projects/cxl_iscsi/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
  projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
  projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
  projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
  projects/cxl_iscsi/contrib/llvm/lib/IR/AsmWriter.cpp
  projects/cxl_iscsi/contrib/llvm/lib/IR/Core.cpp
  projects/cxl_iscsi/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp
  projects/cxl_iscsi/contrib/llvm/lib/MC/MCContext.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h
  projects/cxl_iscsi/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFRegisterInfo.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  projects/cxl_iscsi/contrib/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCCTRLoops.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCInstrInfo.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCInstrQPX.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCInstrVSX.td
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Target/Sparc/AsmParser/SparcAsmParser.cpp   (contents, props changed)
  projects/cxl_iscsi/contrib/llvm/lib/Transforms/IPO/PassManagerBuilder.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Transforms/Scalar/GVN.cpp
  projects/cxl_iscsi/contrib/llvm/lib/Transforms/Utils/Local.cpp
  projects/cxl_iscsi/contrib/llvm/patches/README.TXT
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/CodeGen/CGCall.cpp
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/cxl_iscsi/contrib/llvm/tools/clang/lib/Sema/SemaExprCXX.cpp
  projects/cxl_iscsi/contrib/llvm/tools/llvm-lto/llvm-lto.cpp
  projects/cxl_iscsi/etc/mtree/BSD.debug.dist
  projects/cxl_iscsi/etc/mtree/BSD.usr.dist
  projects/cxl_iscsi/lib/clang/include/Makefile
  projects/cxl_iscsi/lib/clang/include/clang/Basic/Version.inc
  projects/cxl_iscsi/lib/clang/include/clang/Config/config.h
  projects/cxl_iscsi/lib/clang/include/llvm/Config/config.h
  projects/cxl_iscsi/lib/clang/include/llvm/Config/llvm-config.h
  projects/cxl_iscsi/lib/libc/Makefile
  projects/cxl_iscsi/lib/libc/net/gethostbynis.c
  projects/cxl_iscsi/lib/libc/net/netdb_private.h
  projects/cxl_iscsi/lib/libclang_rt/Makefile.inc
  projects/cxl_iscsi/share/mk/bsd.lib.mk
  projects/cxl_iscsi/share/mk/sys.mk
  projects/cxl_iscsi/sys/arm/arm/pmap-v6-new.c
  projects/cxl_iscsi/sys/dev/isci/scil/scic_sds_phy.h
  projects/cxl_iscsi/sys/dev/isp/isp.c
  projects/cxl_iscsi/sys/dev/isp/isp_freebsd.c
  projects/cxl_iscsi/sys/dev/isp/isp_library.c
  projects/cxl_iscsi/sys/dev/isp/isp_library.h
  projects/cxl_iscsi/sys/dev/isp/isp_pci.c
  projects/cxl_iscsi/sys/dev/isp/isp_target.c
  projects/cxl_iscsi/sys/dev/isp/ispvar.h
  projects/cxl_iscsi/sys/dev/netmap/netmap.c
  projects/cxl_iscsi/sys/mips/cavium/cvmx_config.h
  projects/cxl_iscsi/sys/netinet/if_ether.c
  projects/cxl_iscsi/sys/netinet/sctp_output.c
  projects/cxl_iscsi/tools/build/mk/OptionalObsoleteFiles.inc
  projects/cxl_iscsi/usr.bin/bmake/Makefile
Directory Properties:
  projects/cxl_iscsi/   (props changed)
  projects/cxl_iscsi/contrib/bmake/   (props changed)
  projects/cxl_iscsi/contrib/llvm/   (props changed)
  projects/cxl_iscsi/contrib/llvm/tools/clang/   (props changed)
  projects/cxl_iscsi/contrib/llvm/tools/llvm-dwarfdump/   (props changed)
  projects/cxl_iscsi/contrib/llvm/tools/llvm-lto/   (props changed)
  projects/cxl_iscsi/lib/libc/   (props changed)
  projects/cxl_iscsi/share/   (props changed)
  projects/cxl_iscsi/sys/   (props changed)

Modified: projects/cxl_iscsi/ObsoleteFiles.inc
==============================================================================
--- projects/cxl_iscsi/ObsoleteFiles.inc	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/ObsoleteFiles.inc	Sat Dec 26 00:31:19 2015	(r292737)
@@ -38,6 +38,88 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20151225: new clang import which bumps version from 3.7.0 to 3.7.1.
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/allocator_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/asan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/common_interface_defs.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/coverage_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/dfsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/linux_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/lsan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/msan_interface.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/sanitizer/tsan_interface_atomic.h
+OLD_DIRS+=usr/lib/clang/3.7.0/include/sanitizer
+OLD_FILES+=usr/lib/clang/3.7.0/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/altivec.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512cdintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cpuid.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/fxsrintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/immintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/module.modulemap
+OLD_FILES+=usr/lib/clang/3.7.0/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/vadefs.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/vecintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/3.7.0/include/xtestintrin.h
+OLD_DIRS+=usr/lib/clang/3.7.0/include
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.safestack-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.7.0/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.7.0/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.7.0/lib
+OLD_DIRS+=usr/lib/clang/3.7.0
 # 20151130: libelf moved from /usr/lib to /lib (libkvm dependency in r291406)
 OLD_LIBS+=usr/lib/libelf.so.2
 # 20151115: Fox bad upgrade scheme

Modified: projects/cxl_iscsi/contrib/bmake/ChangeLog
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/ChangeLog	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/ChangeLog	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1,3 +1,9 @@
+2015-12-20  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* Makefile (MAKE_VERSION): 20151220
+	  Merge with NetBSD make, pick up
+	  o suff.c: re-initialize suffNull when clearing suffixes.
+
 2015-12-01  Simon J. Gerraty  <sjg@bad.crufty.net>
 
 	* Makefile (MAKE_VERSION): 20151201

Modified: projects/cxl_iscsi/contrib/bmake/Makefile
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/Makefile	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/Makefile	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1,7 +1,7 @@
-#	$Id: Makefile,v 1.48 2015/12/02 00:36:42 sjg Exp $
+#	$Id: Makefile,v 1.49 2015/12/20 22:54:40 sjg Exp $
 
 # Base version on src date
-MAKE_VERSION= 20151201
+MAKE_VERSION= 20151220
 
 PROG=	bmake
 

Modified: projects/cxl_iscsi/contrib/bmake/mk/ChangeLog
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/mk/ChangeLog	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/mk/ChangeLog	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1,3 +1,9 @@
+2015-12-12  Simon J. Gerraty  <sjg@bad.crufty.net>
+
+	* install-mk (MK_VERSION): 20151212
+	* auto.obj.mk: do not require MAKEOBJDIRPREFIX to exist.
+	  only apply :tA to __objdir when comparing to .OBJDIR
+
 2015-11-14  Simon J. Gerraty  <sjg@bad.crufty.net>
 
 	* install-mk (MK_VERSION): 20151111

Modified: projects/cxl_iscsi/contrib/bmake/mk/auto.obj.mk
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/mk/auto.obj.mk	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/mk/auto.obj.mk	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1,4 +1,4 @@
-# $Id: auto.obj.mk,v 1.11 2015/06/16 06:28:21 sjg Exp $
+# $Id: auto.obj.mk,v 1.12 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 2004, Simon J. Gerraty
 #
@@ -40,12 +40,12 @@ MKOBJDIRS= auto
 .if !defined(NOOBJ) && !defined(NO_OBJ) && ${MKOBJDIRS:Uno} == auto
 # Use __objdir here so it is easier to tweak without impacting
 # the logic.
-.if !empty(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
+.if !empty(MAKEOBJDIRPREFIX)
 __objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
 .endif
 __objdir?= ${MAKEOBJDIR:Uobj}
-__objdir:= ${__objdir:tA}
-.if ${.OBJDIR} != ${__objdir}
+__objdir:= ${__objdir}
+.if ${.OBJDIR:tA} != ${__objdir:tA}
 # We need to chdir, make the directory if needed
 .if !exists(${__objdir}/) && \
 	(${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
@@ -53,11 +53,10 @@ __objdir:= ${__objdir:tA}
 __objdir_made != echo ${__objdir}/; umask ${OBJDIR_UMASK:U002}; \
         ${ECHO_TRACE} "[Creating objdir ${__objdir}...]" >&2; \
         ${Mkdirs}; Mkdirs ${__objdir}
-__objdir:= ${__objdir:tA}
 .endif
 # This causes make to use the specified directory as .OBJDIR
 .OBJDIR: ${__objdir}
-.if ${.OBJDIR} != ${__objdir} && ${__objdir_made:Uno:M${__objdir}/*} != ""
+.if ${.OBJDIR:tA} != ${__objdir:tA} && ${__objdir_made:Uno:M${__objdir}/*} != ""
 .error could not use ${__objdir}: .OBJDIR=${.OBJDIR}
 .endif
 .endif

Modified: projects/cxl_iscsi/contrib/bmake/mk/install-mk
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/mk/install-mk	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/mk/install-mk	Sat Dec 26 00:31:19 2015	(r292737)
@@ -55,7 +55,7 @@
 #       Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: install-mk,v 1.117 2015/11/14 18:09:57 sjg Exp $
+#	$Id: install-mk,v 1.118 2015/12/16 01:57:06 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -70,7 +70,7 @@
 #	sjg@crufty.net
 #
 
-MK_VERSION=20151111
+MK_VERSION=20151212
 OWNER=
 GROUP=
 MODE=444

Modified: projects/cxl_iscsi/contrib/bmake/os.sh
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/os.sh	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/os.sh	Sat Dec 26 00:31:19 2015	(r292737)
@@ -17,7 +17,7 @@
 #	Simon J. Gerraty <sjg@crufty.net>
 
 # RCSid:
-#	$Id: os.sh,v 1.49 2015/10/25 00:05:40 sjg Exp $
+#	$Id: os.sh,v 1.50 2015/12/17 17:06:29 sjg Exp $
 #
 #	@(#) Copyright (c) 1994 Simon J. Gerraty
 #
@@ -56,10 +56,10 @@ Which() {
 	case "$1" in
 	/*)	test $t $1 && echo $1;;
 	*)
-        	# some shells cannot correctly handle `IFS`
-        	# in conjunction with the for loop.
-        	_dirs=`IFS=:; echo ${2:-$PATH}`
-        	for d in $_dirs
+		# some shells cannot correctly handle `IFS`
+		# in conjunction with the for loop.
+		_dirs=`IFS=:; echo ${2:-$PATH}`
+		for d in $_dirs
 		do
 			test $t $d/$1 && { echo $d/$1; break; }
 		done
@@ -70,11 +70,11 @@ Which() {
 # tr is insanely non-portable wrt char classes, so we need to
 # spell out the alphabet. sed y/// would work too.
 toUpper() {
-        ${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
+	${TR:-tr} abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
 }
 
 toLower() {
-        ${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
+	${TR:-tr} ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz
 }
 
 K=
@@ -91,7 +91,7 @@ SunOS)
 	export CHOWN
 	
 	# Great! Solaris keeps moving arch(1)
-        # should just bite the bullet and use uname -p
+	# should just bite the bullet and use uname -p
 	arch=`Which arch /usr/bin:/usr/ucb`
 	
 	MAILER=/usr/ucb/Mail
@@ -105,8 +105,8 @@ SunOS)
 		MACHINE=$MACHINE_ARCH
 		;;
 	4*)
-                MACHINE_ARCH=`arch`
-                ;;
+		MACHINE_ARCH=`arch`
+		;;
 	5*)
 		K=-k
 		LOCAL_FS=ufs
@@ -116,8 +116,8 @@ SunOS)
 		# overwriting an existing file!!!!! We want one that works!
 		test -x /usr/xpg4/bin/ln && LN=${LN:-/usr/xpg4/bin/ln}
 		# wonderful, 5.8's tr again require's []'s
-                # but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
-                # use toUpper/toLower instead.
+		# but /usr/xpg4/bin/tr causes problems if LC_COLLATE is set!
+		# use toUpper/toLower instead.
 		;;
 	esac
 	case "$OS/$MACHINE_ARCH" in
@@ -142,9 +142,9 @@ SunOS)
 		SHARE_ARCH=$OS/$HOST
 		;;
 	OpenBSD)
-	        arch=`Which arch /usr/bin:/usr/ucb:$PATH`
-                MACHINE_ARCH=`$arch -s`
-                ;;
+		arch=`Which arch /usr/bin:/usr/ucb:$PATH`
+		MACHINE_ARCH=`$arch -s`
+		;;
 	esac
 	NAWK=awk
 	export NAWK
@@ -218,17 +218,25 @@ export HOST_TARGET
 
 case `echo -n .` in -n*) N=; C="\c";; *) N=-n; C=;; esac
 
-export HOSTNAME HOST        
+Echo() {
+	case "$1" in
+	-n) _n=$N _c=$C; shift;;
+	*) _n= _c=;;
+	esac
+	echo $_n "$@" $_c
+}
+
+export HOSTNAME HOST	    
 export OS MACHINE MACHINE_ARCH OSREL OSMAJOR LOCAL_FS TMP_DIRS MAILER N C K PS_AXC
 export LN SHARE_ARCH TR
 
 case /$0 in
 */os.sh)
-        for v in $*
+	for v in $*
 	do
-                eval vv=\$$v
-                echo "$v='$vv'"
+		eval vv=\$$v
+		echo "$v='$vv'"
 	done
-        ;;
+	;;
 esac
 

Modified: projects/cxl_iscsi/contrib/bmake/suff.c
==============================================================================
--- projects/cxl_iscsi/contrib/bmake/suff.c	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/bmake/suff.c	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1,4 +1,4 @@
-/*	$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $	*/
+/*	$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $";
+static char rcsid[] = "$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
 #else
-__RCSID("$NetBSD: suff.c,v 1.74 2015/10/11 04:51:24 sjg Exp $");
+__RCSID("$NetBSD: suff.c,v 1.75 2015/12/20 22:44:10 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -553,7 +553,20 @@ Suff_ClearSuffixes(void)
 #endif
     sufflist = Lst_Init(FALSE);
     sNum = 0;
-    suffNull = emptySuff;
+    if (suffNull)
+	SuffFree(suffNull);
+    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
+
+    suffNull->name =   	    bmake_strdup("");
+    suffNull->nameLen =     0;
+    suffNull->searchPath =  Lst_Init(FALSE);
+    Dir_Concat(suffNull->searchPath, dirSearchPath);
+    suffNull->children =    Lst_Init(FALSE);
+    suffNull->parents =	    Lst_Init(FALSE);
+    suffNull->ref =	    Lst_Init(FALSE);
+    suffNull->sNum =   	    sNum++;
+    suffNull->flags =  	    SUFF_NULL;
+    suffNull->refCount =    1;
 }
 
 /*-
@@ -2524,32 +2537,18 @@ Suff_SetNull(char *name)
 void
 Suff_Init(void)
 {
-    sufflist = Lst_Init(FALSE);
 #ifdef CLEANUP
     suffClean = Lst_Init(FALSE);
 #endif
     srclist = Lst_Init(FALSE);
     transforms = Lst_Init(FALSE);
 
-    sNum = 0;
     /*
      * Create null suffix for single-suffix rules (POSIX). The thing doesn't
      * actually go on the suffix list or everyone will think that's its
      * suffix.
      */
-    emptySuff = suffNull = bmake_malloc(sizeof(Suff));
-
-    suffNull->name =   	    bmake_strdup("");
-    suffNull->nameLen =     0;
-    suffNull->searchPath =  Lst_Init(FALSE);
-    Dir_Concat(suffNull->searchPath, dirSearchPath);
-    suffNull->children =    Lst_Init(FALSE);
-    suffNull->parents =	    Lst_Init(FALSE);
-    suffNull->ref =	    Lst_Init(FALSE);
-    suffNull->sNum =   	    sNum++;
-    suffNull->flags =  	    SUFF_NULL;
-    suffNull->refCount =    1;
-
+    Suff_ClearSuffixes();
 }
 
 

Modified: projects/cxl_iscsi/contrib/llvm/include/llvm-c/Core.h
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/include/llvm-c/Core.h	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/include/llvm-c/Core.h	Sat Dec 26 00:31:19 2015	(r292737)
@@ -2675,7 +2675,8 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder
                              LLVMBasicBlockRef Then, LLVMBasicBlockRef Catch,
                              const char *Name);
 LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
-                                 unsigned NumClauses, const char *Name);
+                                 LLVMValueRef PersFn, unsigned NumClauses,
+                                 const char *Name);
 LLVMValueRef LLVMBuildResume(LLVMBuilderRef B, LLVMValueRef Exn);
 LLVMValueRef LLVMBuildUnreachable(LLVMBuilderRef);
 

Modified: projects/cxl_iscsi/contrib/llvm/include/llvm/CodeGen/CommandFlags.h
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/include/llvm/CodeGen/CommandFlags.h	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/include/llvm/CodeGen/CommandFlags.h	Sat Dec 26 00:31:19 2015	(r292737)
@@ -21,7 +21,7 @@
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/Module.h"
 #include "llvm/MC/MCTargetOptionsCommandFlags.h"
-#include "llvm//MC/SubtargetFeature.h"
+#include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Support/CodeGen.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Host.h"

Modified: projects/cxl_iscsi/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/CodeGen/AsmPrinter/WinException.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -169,7 +169,7 @@ void WinException::endFunction(const Mac
     Asm->OutStreamer->PopSection();
   }
 
-  if (shouldEmitMoves)
+  if (shouldEmitMoves || shouldEmitPersonality)
     Asm->OutStreamer->EmitWinCFIEndProc();
 }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -439,7 +439,7 @@ ExpandUnalignedLoad(LoadSDNode *LD, Sele
                              ISD::ANY_EXTEND, dl, VT, Result);
 
       ValResult = Result;
-      ChainResult = Chain;
+      ChainResult = newLoad.getValue(1);
       return;
     }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1010,6 +1010,8 @@ SDValue DAGTypeLegalizer::GetVectorEleme
 
   // Calculate the element offset and add it to the pointer.
   unsigned EltSize = EltVT.getSizeInBits() / 8; // FIXME: should be ABI size.
+  assert(EltSize * 8 == EltVT.getSizeInBits() &&
+         "Converting bits to bytes lost precision");
 
   Index = DAG.getNode(ISD::MUL, dl, Index.getValueType(), Index,
                       DAG.getConstant(EltSize, dl, Index.getValueType()));

Modified: projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1528,9 +1528,25 @@ SDValue DAGTypeLegalizer::SplitVecOp_EXT
   if (CustomLowerNode(N, N->getValueType(0), true))
     return SDValue();
 
-  // Store the vector to the stack.
-  EVT EltVT = VecVT.getVectorElementType();
+  // Make the vector elements byte-addressable if they aren't already.
   SDLoc dl(N);
+  EVT EltVT = VecVT.getVectorElementType();
+  if (EltVT.getSizeInBits() < 8) {
+    SmallVector<SDValue, 4> ElementOps;
+    for (unsigned i = 0; i < VecVT.getVectorNumElements(); ++i) {
+      ElementOps.push_back(DAG.getAnyExtOrTrunc(
+          DAG.getNode(ISD::EXTRACT_VECTOR_ELT, dl, EltVT, Vec,
+                      DAG.getConstant(i, dl, MVT::i8)),
+          dl, MVT::i8));
+    }
+
+    EltVT = MVT::i8;
+    VecVT = EVT::getVectorVT(*DAG.getContext(), EltVT,
+                             VecVT.getVectorNumElements());
+    Vec = DAG.getNode(ISD::BUILD_VECTOR, dl, VecVT, ElementOps);
+  }
+
+  // Store the vector to the stack.
   SDValue StackPtr = DAG.CreateStackTemporary(VecVT);
   SDValue Store = DAG.getStore(DAG.getEntryNode(), dl, Vec, StackPtr,
                                MachinePointerInfo(), false, false, 0);

Modified: projects/cxl_iscsi/contrib/llvm/lib/IR/AsmWriter.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/IR/AsmWriter.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/IR/AsmWriter.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -794,6 +794,10 @@ void SlotTracker::processFunction() {
   ST_DEBUG("begin processFunction!\n");
   fNext = 0;
 
+  // Process function metadata if it wasn't hit at the module-level.
+  if (!ShouldInitializeAllMetadata)
+    processFunctionMetadata(*TheFunction);
+
   // Add all the function arguments with no names.
   for(Function::const_arg_iterator AI = TheFunction->arg_begin(),
       AE = TheFunction->arg_end(); AI != AE; ++AI)
@@ -807,8 +811,6 @@ void SlotTracker::processFunction() {
     if (!BB.hasName())
       CreateFunctionSlot(&BB);
 
-    processFunctionMetadata(*TheFunction);
-
     for (auto &I : BB) {
       if (!I.getType()->isVoidTy() && !I.hasName())
         CreateFunctionSlot(&I);
@@ -836,11 +838,11 @@ void SlotTracker::processFunction() {
 
 void SlotTracker::processFunctionMetadata(const Function &F) {
   SmallVector<std::pair<unsigned, MDNode *>, 4> MDs;
-  for (auto &BB : F) {
-    F.getAllMetadata(MDs);
-    for (auto &MD : MDs)
-      CreateMetadataSlot(MD.second);
+  F.getAllMetadata(MDs);
+  for (auto &MD : MDs)
+    CreateMetadataSlot(MD.second);
 
+  for (auto &BB : F) {
     for (auto &I : BB)
       processInstructionMetadata(I);
   }

Modified: projects/cxl_iscsi/contrib/llvm/lib/IR/Core.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/IR/Core.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/IR/Core.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -2257,7 +2257,14 @@ LLVMValueRef LLVMBuildInvoke(LLVMBuilder
 }
 
 LLVMValueRef LLVMBuildLandingPad(LLVMBuilderRef B, LLVMTypeRef Ty,
-                                 unsigned NumClauses, const char *Name) {
+                                 LLVMValueRef PersFn, unsigned NumClauses,
+                                 const char *Name) {
+  // The personality used to live on the landingpad instruction, but now it
+  // lives on the parent function. For compatibility, take the provided
+  // personality and put it on the parent function.
+  if (PersFn)
+    unwrap(B)->GetInsertBlock()->getParent()->setPersonalityFn(
+        cast<Function>(unwrap(PersFn)));
   return wrap(unwrap(B)->CreateLandingPad(unwrap(Ty), NumClauses, Name));
 }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/LTO/LTOCodeGenerator.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -63,14 +63,21 @@ const char* LTOCodeGenerator::getVersion
 #endif
 }
 
+static void handleLTODiagnostic(const DiagnosticInfo &DI) {
+  DiagnosticPrinterRawOStream DP(errs());
+  DI.print(DP);
+  errs() << "\n";
+}
+
 LTOCodeGenerator::LTOCodeGenerator()
-    : Context(getGlobalContext()), IRLinker(new Module("ld-temp.o", Context)) {
+    : Context(getGlobalContext()), IRLinker(new Module("ld-temp.o", Context),
+                                            handleLTODiagnostic) {
   initializeLTOPasses();
 }
 
 LTOCodeGenerator::LTOCodeGenerator(std::unique_ptr<LLVMContext> Context)
     : OwnedContext(std::move(Context)), Context(*OwnedContext),
-      IRLinker(new Module("ld-temp.o", *OwnedContext)) {
+      IRLinker(new Module("ld-temp.o", *OwnedContext), handleLTODiagnostic) {
   initializeLTOPasses();
 }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/MC/MCContext.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/MC/MCContext.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/MC/MCContext.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -82,6 +82,7 @@ void MCContext::reset() {
 
   UsedNames.clear();
   Symbols.clear();
+  SectionSymbols.clear();
   Allocator.Reset();
   Instances.clear();
   CompilationDir.clear();

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -264,6 +264,12 @@ void AMDGPUAsmPrinter::getSIProgramInfo(
   for (const MachineBasicBlock &MBB : MF) {
     for (const MachineInstr &MI : MBB) {
       // TODO: CodeSize should account for multiple functions.
+
+      // TODO: Should we count size of debug info?
+      if (MI.isDebugValue())
+        continue;
+
+      // FIXME: This is reporting 0 for many instructions.
       CodeSize += MI.getDesc().Size;
 
       unsigned numOperands = MI.getNumOperands();

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -134,13 +134,17 @@ static Value* GEPToVectorIndex(GetElemen
 //
 // TODO: Check isTriviallyVectorizable for calls and handle other
 // instructions.
-static bool canVectorizeInst(Instruction *Inst) {
+static bool canVectorizeInst(Instruction *Inst, User *User) {
   switch (Inst->getOpcode()) {
   case Instruction::Load:
-  case Instruction::Store:
   case Instruction::BitCast:
   case Instruction::AddrSpaceCast:
     return true;
+  case Instruction::Store: {
+    // Must be the stored pointer operand, not a stored value.
+    StoreInst *SI = cast<StoreInst>(Inst);
+    return SI->getPointerOperand() == User;
+  }
   default:
     return false;
   }
@@ -166,7 +170,7 @@ static bool tryPromoteAllocaToVector(All
   for (User *AllocaUser : Alloca->users()) {
     GetElementPtrInst *GEP = dyn_cast<GetElementPtrInst>(AllocaUser);
     if (!GEP) {
-      if (!canVectorizeInst(cast<Instruction>(AllocaUser)))
+      if (!canVectorizeInst(cast<Instruction>(AllocaUser), Alloca))
         return false;
 
       WorkList.push_back(AllocaUser);
@@ -184,7 +188,7 @@ static bool tryPromoteAllocaToVector(All
 
     GEPVectorIdx[GEP] = Index;
     for (User *GEPUser : AllocaUser->users()) {
-      if (!canVectorizeInst(cast<Instruction>(GEPUser)))
+      if (!canVectorizeInst(cast<Instruction>(GEPUser), AllocaUser))
         return false;
 
       WorkList.push_back(GEPUser);
@@ -240,7 +244,12 @@ static bool collectUsesWithPtrTypes(Valu
   for (User *User : Val->users()) {
     if(std::find(WorkList.begin(), WorkList.end(), User) != WorkList.end())
       continue;
-    if (isa<CallInst>(User)) {
+    if (CallInst *CI = dyn_cast<CallInst>(User)) {
+      // TODO: We might be able to handle some cases where the callee is a
+      // constantexpr bitcast of a function.
+      if (!CI->getCalledFunction())
+        return false;
+
       WorkList.push_back(User);
       continue;
     }
@@ -250,6 +259,12 @@ static bool collectUsesWithPtrTypes(Valu
     if (UseInst && UseInst->getOpcode() == Instruction::PtrToInt)
       return false;
 
+    if (StoreInst *SI = dyn_cast_or_null<StoreInst>(UseInst)) {
+      // Reject if the stored value is not the pointer operand.
+      if (SI->getPointerOperand() != Val)
+        return false;
+    }
+
     if (!User->getType()->isPointerTy())
       continue;
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td	Sat Dec 26 00:31:19 2015	(r292737)
@@ -14,8 +14,7 @@
 let Namespace = "AMDGPU" in {
 
 foreach Index = 0-15 in {
-  // Indices are used in a variety of ways here, so don't set a size/offset.
-  def sub#Index : SubRegIndex<-1, -1>;
+  def sub#Index : SubRegIndex<32, !shl(Index, 5)>;
 }
 
 def INDIRECT_BASE_ADDR : Register <"INDIRECT_BASE_ADDR">;

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -71,12 +71,26 @@ void AMDGPUMCObjectWriter::writeObject(M
   }
 }
 
+static unsigned getFixupKindNumBytes(unsigned Kind) {
+  switch (Kind) {
+  case FK_Data_1:
+    return 1;
+  case FK_Data_2:
+    return 2;
+  case FK_Data_4:
+    return 4;
+  case FK_Data_8:
+    return 8;
+  default:
+    llvm_unreachable("Unknown fixup kind!");
+  }
+}
+
 void AMDGPUAsmBackend::applyFixup(const MCFixup &Fixup, char *Data,
                                   unsigned DataSize, uint64_t Value,
                                   bool IsPCRel) const {
 
   switch ((unsigned)Fixup.getKind()) {
-    default: llvm_unreachable("Unknown fixup kind");
     case AMDGPU::fixup_si_sopp_br: {
       uint16_t *Dst = (uint16_t*)(Data + Fixup.getOffset());
       *Dst = (Value - 4) / 4;
@@ -96,6 +110,24 @@ void AMDGPUAsmBackend::applyFixup(const 
       *Dst = Value + 4;
       break;
     }
+    default: {
+      // FIXME: Copied from AArch64
+      unsigned NumBytes = getFixupKindNumBytes(Fixup.getKind());
+      if (!Value)
+        return; // Doesn't change encoding.
+      MCFixupKindInfo Info = getFixupKindInfo(Fixup.getKind());
+
+      // Shift the value into position.
+      Value <<= Info.TargetOffset;
+
+      unsigned Offset = Fixup.getOffset();
+      assert(Offset + NumBytes <= DataSize && "Invalid fixup offset!");
+
+      // For each byte of the fragment that the fixup touches, mask in the
+      // bits from the fixup value.
+      for (unsigned i = 0; i != NumBytes; ++i)
+        Data[Offset + i] |= uint8_t((Value >> (i * 8)) & 0xff);
+    }
   }
 }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIISelLowering.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -157,6 +157,7 @@ SITargetLowering::SITargetLowering(Targe
 
   setTruncStoreAction(MVT::i64, MVT::i32, Expand);
   setTruncStoreAction(MVT::v8i32, MVT::v8i16, Expand);
+  setTruncStoreAction(MVT::v16i32, MVT::v16i8, Expand);
   setTruncStoreAction(MVT::v16i32, MVT::v16i16, Expand);
 
   setOperationAction(ISD::LOAD, MVT::i1, Custom);
@@ -2252,10 +2253,8 @@ MachineSDNode *SITargetLowering::buildSc
                                                   SDValue Ptr) const {
   const SIInstrInfo *TII =
       static_cast<const SIInstrInfo *>(Subtarget->getInstrInfo());
-  uint64_t Rsrc = TII->getDefaultRsrcDataFormat() | AMDGPU::RSRC_TID_ENABLE |
-                  0xffffffff; // Size
 
-  return buildRSRC(DAG, DL, Ptr, 0, Rsrc);
+  return buildRSRC(DAG, DL, Ptr, 0, TII->getScratchRsrcWords23());
 }
 
 SDValue SITargetLowering::CreateLiveInRegister(SelectionDAG &DAG,

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -2778,3 +2778,16 @@ uint64_t SIInstrInfo::getDefaultRsrcData
 
   return RsrcDataFormat;
 }
+
+uint64_t SIInstrInfo::getScratchRsrcWords23() const {
+  uint64_t Rsrc23 = getDefaultRsrcDataFormat() |
+                    AMDGPU::RSRC_TID_ENABLE |
+                    0xffffffff; // Size;
+
+  // If TID_ENABLE is set, DATA_FORMAT specifies stride bits [14:17].
+  // Clear them unless we want a huge stride.
+  if (ST.getGeneration() >= AMDGPUSubtarget::VOLCANIC_ISLANDS)
+    Rsrc23 &= ~AMDGPU::RSRC_DATA_FORMAT;
+
+  return Rsrc23;
+}

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstrInfo.h	Sat Dec 26 00:31:19 2015	(r292737)
@@ -353,7 +353,7 @@ public:
   }
 
   uint64_t getDefaultRsrcDataFormat() const;
-
+  uint64_t getScratchRsrcWords23() const;
 };
 
 namespace AMDGPU {

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIInstructions.td	Sat Dec 26 00:31:19 2015	(r292737)
@@ -1548,6 +1548,12 @@ defm V_WRITELANE_B32 : VOP2SI_3VI_m <
 // These instructions only exist on SI and CI
 let SubtargetPredicate = isSICI in {
 
+let isCommutable = 1 in {
+defm V_MAC_LEGACY_F32 : VOP2InstSI <vop2<0x6>, "v_mac_legacy_f32",
+  VOP_F32_F32_F32
+>;
+} // End isCommutable = 1
+
 defm V_MIN_LEGACY_F32 : VOP2InstSI <vop2<0xd>, "v_min_legacy_f32",
   VOP_F32_F32_F32, AMDGPUfmin_legacy
 >;
@@ -1562,12 +1568,6 @@ defm V_LSHL_B32 : VOP2InstSI <vop2<0x19>
 } // End isCommutable = 1
 } // End let SubtargetPredicate = SICI
 
-let isCommutable = 1 in {
-defm V_MAC_LEGACY_F32 : VOP2_VI3_Inst <vop23<0x6, 0x28e>, "v_mac_legacy_f32",
-  VOP_F32_F32_F32
->;
-} // End isCommutable = 1
-
 defm V_BFM_B32 : VOP2_VI3_Inst <vop23<0x1e, 0x293>, "v_bfm_b32",
   VOP_I32_I32_I32
 >;

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -135,8 +135,7 @@ bool SIPrepareScratchRegs::runOnMachineF
       unsigned ScratchRsrcReg =
           RS.scavengeRegister(&AMDGPU::SReg_128RegClass, 0);
 
-      uint64_t Rsrc = AMDGPU::RSRC_DATA_FORMAT | AMDGPU::RSRC_TID_ENABLE |
-                      0xffffffff; // Size
+      uint64_t Rsrc23 = TII->getScratchRsrcWords23();
 
       unsigned Rsrc0 = TRI->getSubReg(ScratchRsrcReg, AMDGPU::sub0);
       unsigned Rsrc1 = TRI->getSubReg(ScratchRsrcReg, AMDGPU::sub1);
@@ -152,11 +151,11 @@ bool SIPrepareScratchRegs::runOnMachineF
               .addReg(ScratchRsrcReg, RegState::ImplicitDefine);
 
       BuildMI(MBB, I, DL, TII->get(AMDGPU::S_MOV_B32), Rsrc2)
-              .addImm(Rsrc & 0xffffffff)
+              .addImm(Rsrc23 & 0xffffffff)
               .addReg(ScratchRsrcReg, RegState::ImplicitDefine);
 
       BuildMI(MBB, I, DL, TII->get(AMDGPU::S_MOV_B32), Rsrc3)
-              .addImm(Rsrc >> 32)
+              .addImm(Rsrc23 >> 32)
               .addReg(ScratchRsrcReg, RegState::ImplicitDefine);
 
       // Scratch Offset

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -26,23 +26,25 @@ using namespace llvm;
 
 SIRegisterInfo::SIRegisterInfo() : AMDGPURegisterInfo() {}
 
-BitVector SIRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
-  BitVector Reserved(getNumRegs());
-  Reserved.set(AMDGPU::EXEC);
+void SIRegisterInfo::reserveRegisterTuples(BitVector &Reserved, unsigned Reg) const {
+  MCRegAliasIterator R(Reg, this, true);
 
-  // EXEC_LO and EXEC_HI could be allocated and used as regular register,
-  // but this seems likely to result in bugs, so I'm marking them as reserved.
-  Reserved.set(AMDGPU::EXEC_LO);
-  Reserved.set(AMDGPU::EXEC_HI);
+  for (; R.isValid(); ++R)
+    Reserved.set(*R);
+}
 
+BitVector SIRegisterInfo::getReservedRegs(const MachineFunction &MF) const {
+  BitVector Reserved(getNumRegs());
   Reserved.set(AMDGPU::INDIRECT_BASE_ADDR);
-  Reserved.set(AMDGPU::FLAT_SCR);
-  Reserved.set(AMDGPU::FLAT_SCR_LO);
-  Reserved.set(AMDGPU::FLAT_SCR_HI);
+
+  // EXEC_LO and EXEC_HI could be allocated and used as regular register, but
+  // this seems likely to result in bugs, so I'm marking them as reserved.
+  reserveRegisterTuples(Reserved, AMDGPU::EXEC);
+  reserveRegisterTuples(Reserved, AMDGPU::FLAT_SCR);
 
   // Reserve some VGPRs to use as temp registers in case we have to spill VGPRs
-  Reserved.set(AMDGPU::VGPR255);
-  Reserved.set(AMDGPU::VGPR254);
+  reserveRegisterTuples(Reserved, AMDGPU::VGPR254);
+  reserveRegisterTuples(Reserved, AMDGPU::VGPR255);
 
   // Tonga and Iceland can only allocate a fixed number of SGPRs due
   // to a hw bug.
@@ -54,10 +56,7 @@ BitVector SIRegisterInfo::getReservedReg
 
     for (unsigned i = Limit; i < NumSGPRs; ++i) {
       unsigned Reg = AMDGPU::SGPR_32RegClass.getRegister(i);
-      MCRegAliasIterator R = MCRegAliasIterator(Reg, this, true);
-
-      for (; R.isValid(); ++R)
-        Reserved.set(*R);
+      reserveRegisterTuples(Reserved, Reg);
     }
   }
 

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/AMDGPU/SIRegisterInfo.h	Sat Dec 26 00:31:19 2015	(r292737)
@@ -23,7 +23,10 @@
 namespace llvm {
 
 struct SIRegisterInfo : public AMDGPURegisterInfo {
+private:
+  void reserveRegisterTuples(BitVector &, unsigned Reg) const;
 
+public:
   SIRegisterInfo();
 
   BitVector getReservedRegs(const MachineFunction &MF) const override;

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/ARM/AsmParser/ARMAsmParser.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -15,6 +15,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringSwitch.h"
+#include "llvm/ADT/Triple.h"
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCAssembler.h"
@@ -9104,6 +9105,10 @@ bool ARMAsmParser::parseDirectiveArch(SM
     return false;
   }
 
+  Triple T;
+  STI.setDefaultFeatures(T.getARMCPUForArch(Arch));
+  setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits()));
+
   getTargetStreamer().emitArch(ID);
   return false;
 }

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelDAGToDAG.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -50,6 +50,7 @@ private:
 
   // Complex Pattern for address selection.
   bool SelectAddr(SDValue Addr, SDValue &Base, SDValue &Offset);
+  bool SelectFIAddr(SDValue Addr, SDValue &Base, SDValue &Offset);
 };
 }
 
@@ -67,7 +68,7 @@ bool BPFDAGToDAGISel::SelectAddr(SDValue
       Addr.getOpcode() == ISD::TargetGlobalAddress)
     return false;
 
-  // Addresses of the form FI+const or FI|const
+  // Addresses of the form Addr+const or Addr|const
   if (CurDAG->isBaseWithConstantOffset(Addr)) {
     ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand(1));
     if (isInt<32>(CN->getSExtValue())) {
@@ -89,6 +90,31 @@ bool BPFDAGToDAGISel::SelectAddr(SDValue
   return true;
 }
 
+// ComplexPattern used on BPF FI instruction
+bool BPFDAGToDAGISel::SelectFIAddr(SDValue Addr, SDValue &Base, SDValue &Offset) {
+  SDLoc DL(Addr);
+
+  if (!CurDAG->isBaseWithConstantOffset(Addr))
+    return false;
+
+  // Addresses of the form Addr+const or Addr|const
+  ConstantSDNode *CN = dyn_cast<ConstantSDNode>(Addr.getOperand(1));
+  if (isInt<32>(CN->getSExtValue())) {
+
+    // If the first operand is a FI, get the TargetFI Node
+    if (FrameIndexSDNode *FIN =
+            dyn_cast<FrameIndexSDNode>(Addr.getOperand(0)))
+      Base = CurDAG->getTargetFrameIndex(FIN->getIndex(), MVT::i64);
+    else
+      return false;
+
+    Offset = CurDAG->getTargetConstant(CN->getSExtValue(), DL, MVT::i64);
+    return true;
+  }
+
+  return false;
+}
+
 SDNode *BPFDAGToDAGISel::Select(SDNode *Node) {
   unsigned Opcode = Node->getOpcode();
 
@@ -104,13 +130,6 @@ SDNode *BPFDAGToDAGISel::Select(SDNode *
   // tablegen selection should be handled here.
   switch (Opcode) {
   default: break;
-
-  case ISD::UNDEF: {
-    errs() << "BUG: "; Node->dump(CurDAG); errs() << '\n';
-    report_fatal_error("shouldn't see UNDEF during Select");
-    break;
-  }
-
   case ISD::INTRINSIC_W_CHAIN: {
     unsigned IntNo = cast<ConstantSDNode>(Node->getOperand(1))->getZExtValue();
     switch (IntNo) {

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFISelLowering.cpp	Sat Dec 26 00:31:19 2015	(r292737)
@@ -102,6 +102,7 @@ BPFTargetLowering::BPFTargetLowering(con
 
   setOperationAction(ISD::BR_CC, MVT::i64, Custom);
   setOperationAction(ISD::BR_JT, MVT::Other, Expand);
+  setOperationAction(ISD::BRIND, MVT::Other, Expand);
   setOperationAction(ISD::BRCOND, MVT::Other, Expand);
   setOperationAction(ISD::SETCC, MVT::i64, Expand);
   setOperationAction(ISD::SELECT, MVT::i64, Expand);
@@ -128,9 +129,6 @@ BPFTargetLowering::BPFTargetLowering(con
   setOperationAction(ISD::SUBC, MVT::i64, Expand);
   setOperationAction(ISD::SUBE, MVT::i64, Expand);
 
-  // no UNDEF allowed
-  setOperationAction(ISD::UNDEF, MVT::i64, Expand);
-
   setOperationAction(ISD::ROTR, MVT::i64, Expand);
   setOperationAction(ISD::ROTL, MVT::i64, Expand);
   setOperationAction(ISD::SHL_PARTS, MVT::i64, Expand);

Modified: projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td
==============================================================================
--- projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td	Sat Dec 26 00:26:02 2015	(r292736)
+++ projects/cxl_iscsi/contrib/llvm/lib/Target/BPF/BPFInstrInfo.td	Sat Dec 26 00:31:19 2015	(r292737)
@@ -54,7 +54,8 @@ def i64immSExt32 : PatLeaf<(imm),
                 [{return isInt<32>(N->getSExtValue()); }]>;
 
 // Addressing modes.
-def ADDRri : ComplexPattern<i64, 2, "SelectAddr", [frameindex], []>;
+def ADDRri : ComplexPattern<i64, 2, "SelectAddr", [], []>;
+def FIri : ComplexPattern<i64, 2, "SelectFIAddr", [add, or], []>;
 
 // Address operands
 def MEMri : Operand<i64> {
@@ -260,6 +261,15 @@ def MOV_rr : MOV_RR<"mov">;
 def MOV_ri : MOV_RI<"mov">;
 }
 

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

From owner-svn-src-projects@freebsd.org  Sat Dec 26 06:13:03 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C3D0A52D3A
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sat, 26 Dec 2015 06:13:03 +0000 (UTC) (envelope-from np@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 mx1.freebsd.org (Postfix) with ESMTPS id E68251AB4;
 Sat, 26 Dec 2015 06:13:02 +0000 (UTC) (envelope-from np@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBQ6D2gk005678;
 Sat, 26 Dec 2015 06:13:02 GMT (envelope-from np@FreeBSD.org)
Received: (from np@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBQ6D20r005677;
 Sat, 26 Dec 2015 06:13:02 GMT (envelope-from np@FreeBSD.org)
Message-Id: <201512260613.tBQ6D20r005677@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org
 using -f
From: Navdeep Parhar <np@FreeBSD.org>
Date: Sat, 26 Dec 2015 06:13:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292742 - projects/cxl_iscsi
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Dec 2015 06:13:03 -0000

Author: np
Date: Sat Dec 26 06:13:01 2015
New Revision: 292742
URL: https://svnweb.freebsd.org/changeset/base/292742

Log:
  Done with this branch, the driver is in HEAD now.

Deleted:
  projects/cxl_iscsi/