svn commit: r307489 - in user/alc/PQ_LAUNDRY: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid cddl/contrib/opensolaris/lib/libdtrace/common cddl/usr.sbin/dtrace/tests/tools contrib/libarc...

Mark Johnston markj at FreeBSD.org
Mon Oct 17 07:25:51 UTC 2016 

Author: markj
Date: Mon Oct 17 07:25:46 2016
New Revision: 307489
URL: https://svnweb.freebsd.org/changeset/base/307489

Log:
  MFH r307488

Added:
  user/alc/PQ_LAUNDRY/etc/rc.d/zfsbe
     - copied unchanged from r307488, head/etc/rc.d/zfsbe
  user/alc/PQ_LAUNDRY/lib/libc/libc_nossp.ldscript
     - copied unchanged from r307488, head/lib/libc/libc_nossp.ldscript
  user/alc/PQ_LAUNDRY/lib/libefivar/
     - copied from r307488, head/lib/libefivar/
  user/alc/PQ_LAUNDRY/lib/libgcc_eh/
     - copied from r307488, head/lib/libgcc_eh/
  user/alc/PQ_LAUNDRY/lib/libgcc_s/
     - copied from r307488, head/lib/libgcc_s/
  user/alc/PQ_LAUNDRY/share/mk/bsd.suffixes-posix.mk
     - copied unchanged from r307488, head/share/mk/bsd.suffixes-posix.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.suffixes.mk
     - copied unchanged from r307488, head/share/mk/bsd.suffixes.mk
  user/alc/PQ_LAUNDRY/sys/arm64/conf/RPI3
     - copied unchanged from r307488, head/sys/arm64/conf/RPI3
  user/alc/PQ_LAUNDRY/sys/dev/efidev/
     - copied from r307488, head/sys/dev/efidev/
  user/alc/PQ_LAUNDRY/sys/dev/gpio/gpioregulator.c
     - copied unchanged from r307488, head/sys/dev/gpio/gpioregulator.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/if_ptnet.c
     - copied unchanged from r307488, head/sys/dev/netmap/if_ptnet.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_pt.c
     - copied unchanged from r307488, head/sys/dev/netmap/netmap_pt.c
  user/alc/PQ_LAUNDRY/sys/i386/include/efi.h
     - copied unchanged from r307488, head/sys/i386/include/efi.h
  user/alc/PQ_LAUNDRY/sys/mips/include/efi.h
     - copied unchanged from r307488, head/sys/mips/include/efi.h
  user/alc/PQ_LAUNDRY/sys/net/netmap_virt.h
     - copied unchanged from r307488, head/sys/net/netmap_virt.h
  user/alc/PQ_LAUNDRY/sys/pc98/include/efi.h
     - copied unchanged from r307488, head/sys/pc98/include/efi.h
  user/alc/PQ_LAUNDRY/sys/powerpc/include/efi.h
     - copied unchanged from r307488, head/sys/powerpc/include/efi.h
  user/alc/PQ_LAUNDRY/sys/riscv/include/efi.h
     - copied unchanged from r307488, head/sys/riscv/include/efi.h
  user/alc/PQ_LAUNDRY/sys/sparc64/include/efi.h
     - copied unchanged from r307488, head/sys/sparc64/include/efi.h
  user/alc/PQ_LAUNDRY/sys/sys/efiio.h
     - copied unchanged from r307488, head/sys/sys/efiio.h
  user/alc/PQ_LAUNDRY/tools/tools/netmap/ctrs.h
     - copied unchanged from r307488, head/tools/tools/netmap/ctrs.h
  user/alc/PQ_LAUNDRY/tools/tools/netmap/nmreplay.8
     - copied unchanged from r307488, head/tools/tools/netmap/nmreplay.8
  user/alc/PQ_LAUNDRY/tools/tools/netmap/nmreplay.c
     - copied unchanged from r307488, head/tools/tools/netmap/nmreplay.c
  user/alc/PQ_LAUNDRY/usr.sbin/efivar/
     - copied from r307488, head/usr.sbin/efivar/
Replaced:
  user/alc/PQ_LAUNDRY/sys/sys/apm.h
     - copied unchanged from r307488, head/sys/sys/apm.h
  user/alc/PQ_LAUNDRY/sys/sys/disk/
     - copied from r307488, head/sys/sys/disk/
  user/alc/PQ_LAUNDRY/sys/sys/disklabel.h
     - copied unchanged from r307488, head/sys/sys/disklabel.h
  user/alc/PQ_LAUNDRY/sys/sys/diskmbr.h
     - copied unchanged from r307488, head/sys/sys/diskmbr.h
  user/alc/PQ_LAUNDRY/sys/sys/diskpc98.h
     - copied unchanged from r307488, head/sys/sys/diskpc98.h
  user/alc/PQ_LAUNDRY/sys/sys/gpt.h
     - copied unchanged from r307488, head/sys/sys/gpt.h
  user/alc/PQ_LAUNDRY/sys/sys/vtoc.h
     - copied unchanged from r307488, head/sys/sys/vtoc.h
Deleted:
  user/alc/PQ_LAUNDRY/gnu/usr.bin/rcs/
  user/alc/PQ_LAUNDRY/lib/libefi/
  user/alc/PQ_LAUNDRY/share/doc/psd/13.rcs/
  user/alc/PQ_LAUNDRY/tools/build/options/WITH_RCS
  user/alc/PQ_LAUNDRY/usr.bin/sdiff/common.c
  user/alc/PQ_LAUNDRY/usr.bin/sdiff/common.h
Modified:
  user/alc/PQ_LAUNDRY/ObsoleteFiles.inc
  user/alc/PQ_LAUNDRY/UPDATING
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
  user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_set_format.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/main.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_missing_file.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/h_tools.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
  user/alc/PQ_LAUNDRY/etc/defaults/rc.conf
  user/alc/PQ_LAUNDRY/etc/mtree/BSD.usr.dist
  user/alc/PQ_LAUNDRY/etc/rc
  user/alc/PQ_LAUNDRY/etc/rc.d/Makefile
  user/alc/PQ_LAUNDRY/etc/rc.d/jail
  user/alc/PQ_LAUNDRY/etc/rc.d/zfs
  user/alc/PQ_LAUNDRY/gnu/usr.bin/Makefile
  user/alc/PQ_LAUNDRY/gnu/usr.bin/groff/mdate.sh
  user/alc/PQ_LAUNDRY/include/Makefile
  user/alc/PQ_LAUNDRY/include/search.h
  user/alc/PQ_LAUNDRY/lib/Makefile
  user/alc/PQ_LAUNDRY/lib/libc/Makefile
  user/alc/PQ_LAUNDRY/lib/libc/gen/arc4random.c
  user/alc/PQ_LAUNDRY/lib/libc/gen/recvmmsg.c
  user/alc/PQ_LAUNDRY/lib/libc/mips/string/strchr.S
  user/alc/PQ_LAUNDRY/lib/libc/mips/string/strrchr.S
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/random.c
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/tdelete.c
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/tfind.c
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/tsearch.3
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/tsearch.c
  user/alc/PQ_LAUNDRY/lib/libc/stdlib/twalk.c
  user/alc/PQ_LAUNDRY/lib/libc/tests/stdio/printbasic_test.c
  user/alc/PQ_LAUNDRY/lib/libc/tests/stdlib/tsearch_test.c
  user/alc/PQ_LAUNDRY/lib/libdevdctl/consumer.cc
  user/alc/PQ_LAUNDRY/lib/libucl/Makefile
  user/alc/PQ_LAUNDRY/lib/msun/Makefile
  user/alc/PQ_LAUNDRY/lib/msun/src/s_fmax.c
  user/alc/PQ_LAUNDRY/lib/msun/src/s_fmin.c
  user/alc/PQ_LAUNDRY/libexec/ypxfr/ypxfr_getmap.c
  user/alc/PQ_LAUNDRY/release/Makefile.vm
  user/alc/PQ_LAUNDRY/release/arm/BANANAPI.conf
  user/alc/PQ_LAUNDRY/release/arm/CUBIEBOARD2.conf
  user/alc/PQ_LAUNDRY/release/arm/RPI2.conf
  user/alc/PQ_LAUNDRY/release/doc/share/xml/sponsor.ent
  user/alc/PQ_LAUNDRY/release/picobsd/build/picobsd
  user/alc/PQ_LAUNDRY/release/tools/vmimage.subr
  user/alc/PQ_LAUNDRY/sbin/pfctl/parse.y
  user/alc/PQ_LAUNDRY/share/doc/psd/Makefile
  user/alc/PQ_LAUNDRY/share/man/man4/netmap.4
  user/alc/PQ_LAUNDRY/share/man/man5/pf.conf.5
  user/alc/PQ_LAUNDRY/share/man/man5/src.conf.5
  user/alc/PQ_LAUNDRY/share/mk/Makefile
  user/alc/PQ_LAUNDRY/share/mk/bsd.lib.mk
  user/alc/PQ_LAUNDRY/share/mk/bsd.libnames.mk
  user/alc/PQ_LAUNDRY/share/mk/src.libnames.mk
  user/alc/PQ_LAUNDRY/share/mk/src.opts.mk
  user/alc/PQ_LAUNDRY/share/mk/sys.mk
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/efirt.c   (contents, props changed)
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/mem.c
  user/alc/PQ_LAUNDRY/sys/amd64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_ccu.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp209.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/axp209reg.h
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_gate.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_pll.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/mem.c
  user/alc/PQ_LAUNDRY/sys/arm/arm/nexus.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_common.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_intr.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_spi.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c
  user/alc/PQ_LAUNDRY/sys/arm/broadcom/bcm2835/files.bcm283x
  user/alc/PQ_LAUNDRY/sys/arm/conf/ATMEL
  user/alc/PQ_LAUNDRY/sys/arm/conf/AVILA
  user/alc/PQ_LAUNDRY/sys/arm/conf/BWCT
  user/alc/PQ_LAUNDRY/sys/arm/conf/CAMBRIA
  user/alc/PQ_LAUNDRY/sys/arm/conf/CNS11XXNAS
  user/alc/PQ_LAUNDRY/sys/arm/conf/CRB
  user/alc/PQ_LAUNDRY/sys/arm/conf/DB-78XXX
  user/alc/PQ_LAUNDRY/sys/arm/conf/DB-88F5XXX
  user/alc/PQ_LAUNDRY/sys/arm/conf/DB-88F6XXX
  user/alc/PQ_LAUNDRY/sys/arm/conf/DOCKSTAR
  user/alc/PQ_LAUNDRY/sys/arm/conf/DREAMPLUG-1001
  user/alc/PQ_LAUNDRY/sys/arm/conf/EA3250
  user/alc/PQ_LAUNDRY/sys/arm/conf/EB9200
  user/alc/PQ_LAUNDRY/sys/arm/conf/ETHERNUT5
  user/alc/PQ_LAUNDRY/sys/arm/conf/EXYNOS5.common
  user/alc/PQ_LAUNDRY/sys/arm/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/arm/conf/GUMSTIX
  user/alc/PQ_LAUNDRY/sys/arm/conf/HL200
  user/alc/PQ_LAUNDRY/sys/arm/conf/HL201
  user/alc/PQ_LAUNDRY/sys/arm/conf/KB920X
  user/alc/PQ_LAUNDRY/sys/arm/conf/NSLU
  user/alc/PQ_LAUNDRY/sys/arm/conf/QILA9G20
  user/alc/PQ_LAUNDRY/sys/arm/conf/SAM9260EK
  user/alc/PQ_LAUNDRY/sys/arm/conf/SAM9G20EK
  user/alc/PQ_LAUNDRY/sys/arm/conf/SAM9X25EK
  user/alc/PQ_LAUNDRY/sys/arm/conf/SHEEVAPLUG
  user/alc/PQ_LAUNDRY/sys/arm/conf/SN9G45
  user/alc/PQ_LAUNDRY/sys/arm/conf/TS7800
  user/alc/PQ_LAUNDRY/sys/arm/conf/std.armv6
  user/alc/PQ_LAUNDRY/sys/arm/include/efi.h
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/identcpu.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/locore.S
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/machdep.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/mem.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/mp_machdep.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/nexus.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/vfp.c
  user/alc/PQ_LAUNDRY/sys/arm64/arm64/vm_machdep.c
  user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/arm64/include/armreg.h
  user/alc/PQ_LAUNDRY/sys/arm64/include/efi.h
  user/alc/PQ_LAUNDRY/sys/arm64/include/pcb.h
  user/alc/PQ_LAUNDRY/sys/arm64/include/vfp.h
  user/alc/PQ_LAUNDRY/sys/boot/arm/uboot/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/common/bootstrap.h
  user/alc/PQ_LAUNDRY/sys/boot/common/dev_net.c
  user/alc/PQ_LAUNDRY/sys/boot/common/interp.c
  user/alc/PQ_LAUNDRY/sys/boot/common/interp_forth.c
  user/alc/PQ_LAUNDRY/sys/boot/common/loader.8
  user/alc/PQ_LAUNDRY/sys/boot/common/pnp.c
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/amd64/ldscript.amd64
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/arm/ldscript.arm
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/arm64/ldscript.arm64
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/i386/efimd.c
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/i386/elf32_freebsd.c
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/i386/exec.c
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/arch/i386/ldscript.i386
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/main.c
  user/alc/PQ_LAUNDRY/sys/boot/ficl/ficl.h
  user/alc/PQ_LAUNDRY/sys/boot/ficl/i386/sysdep.c
  user/alc/PQ_LAUNDRY/sys/boot/ficl/loader.c
  user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/biospci.c
  user/alc/PQ_LAUNDRY/sys/boot/i386/libi386/libi386.h
  user/alc/PQ_LAUNDRY/sys/boot/mips/beri/loader/loader.ldscript
  user/alc/PQ_LAUNDRY/sys/boot/mips/uboot/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/pc98/libpc98/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/powerpc/kboot/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/powerpc/ofw/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/powerpc/ps3/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/sparc64/loader/Makefile
  user/alc/PQ_LAUNDRY/sys/boot/userboot/userboot/Makefile
  user/alc/PQ_LAUNDRY/sys/cam/cam_compat.c
  user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl.c
  user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl.h
  user/alc/PQ_LAUNDRY/sys/cam/ctl/ctl_backend.c
  user/alc/PQ_LAUNDRY/sys/cam/scsi/scsi_enc_ses.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/alc/PQ_LAUNDRY/sys/conf/NOTES
  user/alc/PQ_LAUNDRY/sys/conf/files
  user/alc/PQ_LAUNDRY/sys/conf/files.arm64
  user/alc/PQ_LAUNDRY/sys/conf/kern.opts.mk
  user/alc/PQ_LAUNDRY/sys/conf/options
  user/alc/PQ_LAUNDRY/sys/conf/options.arm64
  user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/cvmx-dma-engine.h
  user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/cvmx-higig.h
  user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/cvmx-pcie.c
  user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/cvmx-raid.h
  user/alc/PQ_LAUNDRY/sys/contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c
  user/alc/PQ_LAUNDRY/sys/dev/acpi_support/atk0110.c
  user/alc/PQ_LAUNDRY/sys/dev/atkbdc/atkbdc.c
  user/alc/PQ_LAUNDRY/sys/dev/cxgbe/t4_main.c
  user/alc/PQ_LAUNDRY/sys/dev/drm2/i915/i915_gem.c
  user/alc/PQ_LAUNDRY/sys/dev/drm2/ttm/ttm_bo_vm.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/include/vmbus.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_rndis_filter.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/if_hnvar.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_br.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chan.c
  user/alc/PQ_LAUNDRY/sys/dev/iicbus/iicsmb.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm.c
  user/alc/PQ_LAUNDRY/sys/dev/kbd/kbd.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/if_ixl_netmap.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/if_lem_netmap.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/ixgbe_netmap.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_freebsd.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_generic.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_kern.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_mbq.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_mbq.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_mem2.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_mem2.h
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_monitor.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_offloadings.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_pipe.c
  user/alc/PQ_LAUNDRY/sys/dev/netmap/netmap_vale.c
  user/alc/PQ_LAUNDRY/sys/dev/otus/if_otus.c
  user/alc/PQ_LAUNDRY/sys/dev/sfxge/common/ef10_nic.c
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smbconf.h
  user/alc/PQ_LAUNDRY/sys/dev/smbus/smbus.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/controller/dwc_otg_fdt.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/net/if_smsc.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_rsu.c
  user/alc/PQ_LAUNDRY/sys/fs/nandfs/nandfs_vnops.c
  user/alc/PQ_LAUNDRY/sys/i386/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/i386/i386/mem.c
  user/alc/PQ_LAUNDRY/sys/kern/kern_linker.c
  user/alc/PQ_LAUNDRY/sys/kern/subr_gtaskqueue.c
  user/alc/PQ_LAUNDRY/sys/kern/subr_intr.c
  user/alc/PQ_LAUNDRY/sys/kern/uipc_accf.c
  user/alc/PQ_LAUNDRY/sys/kern/vfs_bio.c
  user/alc/PQ_LAUNDRY/sys/mips/conf/ADM5120
  user/alc/PQ_LAUNDRY/sys/mips/conf/ALCHEMY
  user/alc/PQ_LAUNDRY/sys/mips/conf/AR71XX_BASE
  user/alc/PQ_LAUNDRY/sys/mips/conf/AR724X_BASE
  user/alc/PQ_LAUNDRY/sys/mips/conf/BCM
  user/alc/PQ_LAUNDRY/sys/mips/conf/BERI_TEMPLATE
  user/alc/PQ_LAUNDRY/sys/mips/conf/ERL
  user/alc/PQ_LAUNDRY/sys/mips/conf/GXEMUL
  user/alc/PQ_LAUNDRY/sys/mips/conf/GXEMUL32
  user/alc/PQ_LAUNDRY/sys/mips/conf/IDT
  user/alc/PQ_LAUNDRY/sys/mips/conf/MT7620
  user/alc/PQ_LAUNDRY/sys/mips/conf/OCTEON1
  user/alc/PQ_LAUNDRY/sys/mips/conf/PB92
  user/alc/PQ_LAUNDRY/sys/mips/conf/QCA953X_BASE
  user/alc/PQ_LAUNDRY/sys/mips/conf/QEMU
  user/alc/PQ_LAUNDRY/sys/mips/conf/RT305X
  user/alc/PQ_LAUNDRY/sys/mips/conf/RT5350
  user/alc/PQ_LAUNDRY/sys/mips/conf/SENTRY5
  user/alc/PQ_LAUNDRY/sys/mips/conf/XLR
  user/alc/PQ_LAUNDRY/sys/mips/conf/XLR64
  user/alc/PQ_LAUNDRY/sys/mips/conf/XLRN32
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR5312
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR5315
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR91XX
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR933X
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.AR934X
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.MALTA
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.QCA955X
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.SWARM
  user/alc/PQ_LAUNDRY/sys/mips/conf/std.XLP
  user/alc/PQ_LAUNDRY/sys/mips/mips/nexus.c
  user/alc/PQ_LAUNDRY/sys/modules/bwn/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/cc/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/efirt/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/khelp/Makefile
  user/alc/PQ_LAUNDRY/sys/modules/netmap/Makefile
  user/alc/PQ_LAUNDRY/sys/net/if.c
  user/alc/PQ_LAUNDRY/sys/net/if_llatbl.c
  user/alc/PQ_LAUNDRY/sys/net/if_llatbl.h
  user/alc/PQ_LAUNDRY/sys/net/netmap.h
  user/alc/PQ_LAUNDRY/sys/net/netmap_user.h
  user/alc/PQ_LAUNDRY/sys/net80211/ieee80211.h
  user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_freebsd.h
  user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_ht.c
  user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_input.c
  user/alc/PQ_LAUNDRY/sys/net80211/ieee80211_proto.h
  user/alc/PQ_LAUNDRY/sys/netinet/in_pcb.c
  user/alc/PQ_LAUNDRY/sys/netinet/ip_output.c
  user/alc/PQ_LAUNDRY/sys/netinet/sctp_pcb.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_input.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_output.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_stacks/fastpath.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_subr.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_syncache.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_timer.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_usrreq.c
  user/alc/PQ_LAUNDRY/sys/netinet/tcp_var.h
  user/alc/PQ_LAUNDRY/sys/netinet6/ip6_output.c
  user/alc/PQ_LAUNDRY/sys/netpfil/pf/pf.c
  user/alc/PQ_LAUNDRY/sys/netpfil/pf/pf_norm.c
  user/alc/PQ_LAUNDRY/sys/pc98/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/powerpc/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/powerpc/conf/GENERIC64
  user/alc/PQ_LAUNDRY/sys/powerpc/conf/MPC85XX
  user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/machdep.c
  user/alc/PQ_LAUNDRY/sys/powerpc/powerpc/mem.c
  user/alc/PQ_LAUNDRY/sys/riscv/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/sparc64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/sys/linker.h
  user/alc/PQ_LAUNDRY/sys/sys/mbuf.h
  user/alc/PQ_LAUNDRY/sys/sys/param.h
  user/alc/PQ_LAUNDRY/sys/vm/vm_fault.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_object.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_page.c
  user/alc/PQ_LAUNDRY/sys/vm/vm_page.h
  user/alc/PQ_LAUNDRY/sys/x86/x86/io_apic.c
  user/alc/PQ_LAUNDRY/targets/pseudo/userland/misc/Makefile.depend
  user/alc/PQ_LAUNDRY/tools/build/mk/OptionalObsoleteFiles.inc
  user/alc/PQ_LAUNDRY/tools/tools/netmap/Makefile
  user/alc/PQ_LAUNDRY/tools/tools/netmap/bridge.c
  user/alc/PQ_LAUNDRY/tools/tools/netmap/pkt-gen.c
  user/alc/PQ_LAUNDRY/tools/tools/netmap/vale-ctl.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/Makefile
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/apm.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/bsd.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/ebr.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/gpt.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/mbr.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/pc98.c
  user/alc/PQ_LAUNDRY/usr.bin/mkimg/vtoc8.c
  user/alc/PQ_LAUNDRY/usr.bin/sdiff/Makefile
  user/alc/PQ_LAUNDRY/usr.bin/sdiff/edit.c
  user/alc/PQ_LAUNDRY/usr.bin/sdiff/sdiff.c
  user/alc/PQ_LAUNDRY/usr.bin/truss/syscalls.c
  user/alc/PQ_LAUNDRY/usr.sbin/Makefile
  user/alc/PQ_LAUNDRY/usr.sbin/bsdconfig/share/sysrc.subr
  user/alc/PQ_LAUNDRY/usr.sbin/ctladm/ctladm.8
  user/alc/PQ_LAUNDRY/usr.sbin/freebsd-update/freebsd-update.sh
  user/alc/PQ_LAUNDRY/usr.sbin/pmcstat/pmcstat_log.h
Directory Properties:
  user/alc/PQ_LAUNDRY/   (props changed)
  user/alc/PQ_LAUNDRY/cddl/   (props changed)
  user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/libarchive/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/   (props changed)
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/   (props changed)
  user/alc/PQ_LAUNDRY/sys/contrib/octeon-sdk/   (props changed)

Modified: user/alc/PQ_LAUNDRY/ObsoleteFiles.inc
==============================================================================
--- user/alc/PQ_LAUNDRY/ObsoleteFiles.inc	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/ObsoleteFiles.inc	Mon Oct 17 07:25:46 2016	(r307489)
@@ -38,6 +38,30 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20161015: Remove GNU rcs
+OLD_FILES+=usr/bin/ci
+OLD_FILES+=usr/bin/co
+OLD_FILES+=usr/bin/merge
+OLD_FILES+=usr/bin/rcs
+OLD_FILES+=usr/bin/rcsclean
+OLD_FILES+=usr/bin/rcsdiff
+OLD_FILES+=usr/bin/rcsfreeze
+OLD_FILES+=usr/bin/rcsmerge
+OLD_FILES+=usr/bin/rlog
+OLD_FILES+=usr/share/doc/psd/13.rcs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/13.rcs/rcs_func.ascii.gz
+OLD_DIRS+=usr/share/doc/psd/13.rcs
+OLD_FILES+=usr/share/man/man1/ci.1.gz
+OLD_FILES+=usr/share/man/man1/co.1.gz
+OLD_FILES+=usr/share/man/man1/merge.1.gz
+OLD_FILES+=usr/share/man/man1/rcs.1.gz
+OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
+OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
+OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
+OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
+OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
+OLD_FILES+=usr/share/man/man1/rlog.1.gz
+OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
 # 20161010: remove link to removed m_getclr(9) macro
 OLD_FILES+=usr/share/man/man9/m_getclr.9.gz
 # 20161003: MK_ELFCOPY_AS_OBJCOPY option retired
@@ -482,9 +506,6 @@ OLD_FILES+=usr/lib/clang/3.7.0/lib/freeb
 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
-# 20151201: mqueue tests 3 and 4 disabled
-OLD_FILES+=usr/tests/sys/mqueue/mqtest3
-OLD_FILES+=usr/tests/sys/mqueue/mqtest4
 # 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: user/alc/PQ_LAUNDRY/UPDATING
==============================================================================
--- user/alc/PQ_LAUNDRY/UPDATING	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/UPDATING	Mon Oct 17 07:25:46 2016	(r307489)
@@ -31,6 +31,17 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20161015:
+	GNU rcs has been removed from base.  It is available as packages:
+	- rcs: Latest GPLv3 GNU rcs version.
+	- rcs57: Copy of the latest version of GNU rcs (GPLv2) before it was
+	removed from base.
+
+20161008:
+	Use of the cc_cdg, cc_chd, cc_hd, or cc_vegas congestion control
+	modules now requires that the kernel configuration contain the
+	TCP_HHOOK option. (This option is included in the GENERIC kernel.)
+
 20161003:
 	The WITHOUT_ELFCOPY_AS_OBJCOPY src.conf(5) knob has been retired.
 	ELF Tool Chain's elfcopy is always installed as /usr/bin/objcopy.

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -31,8 +31,8 @@
 #include <unistd.h>
 
 int
-go(int arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6,
-    int arg7, int arg8, int arg9)
+go(long arg0, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6,
+   long arg7, long arg8, long arg9)
 {
 	return (arg1);
 }

Modified: user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -581,6 +581,7 @@ int
 dt_printf(dtrace_hdl_t *dtp, FILE *fp, const char *format, ...)
 {
 	va_list ap;
+	va_list ap2;
 	int n;
 
 #ifndef illumos
@@ -605,11 +606,13 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c
 		len = dtp->dt_sprintf_buflen - len;
 		assert(len >= 0);
 
-		if ((n = vsnprintf(buf, len, format, ap)) < 0)
+		va_copy(ap2, ap);
+		if ((n = vsnprintf(buf, len, format, ap2)) < 0)
 			n = dt_set_errno(dtp, errno);
 
+		va_end(ap2);
 		va_end(ap);
-
+		
 		return (n);
 	}
 
@@ -640,11 +643,14 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c
 			dtp->dt_buffered_buf[0] = '\0';
 		}
 
-		if ((needed = vsnprintf(NULL, 0, format, ap)) < 0) {
+		va_copy(ap2, ap);
+		if ((needed = vsnprintf(NULL, 0, format, ap2)) < 0) {
 			rval = dt_set_errno(dtp, errno);
+			va_end(ap2);
 			va_end(ap);
 			return (rval);
 		}
+		va_end(ap2);
 
 		if (needed == 0) {
 			va_end(ap);
@@ -670,12 +676,15 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c
 			dtp->dt_buffered_size <<= 1;
 		}
 
+		va_copy(ap2, ap);
 		if (vsnprintf(&dtp->dt_buffered_buf[dtp->dt_buffered_offs],
-		    avail, format, ap) < 0) {
+		    avail, format, ap2) < 0) {
 			rval = dt_set_errno(dtp, errno);
+			va_end(ap2);
 			va_end(ap);
 			return (rval);
 		}
+		va_end(ap2);
 
 		dtp->dt_buffered_offs += needed;
 		assert(dtp->dt_buffered_buf[dtp->dt_buffered_offs] == '\0');
@@ -683,8 +692,10 @@ dt_printf(dtrace_hdl_t *dtp, FILE *fp, c
 		return (0);
 	}
 
-	n = vfprintf(fp, format, ap);
+	va_copy(ap2, ap);
+	n = vfprintf(fp, format, ap2);
 	fflush(fp);
+	va_end(ap2);
 	va_end(ap);
 
 	if (n < 0) {

Modified: user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/exclude.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/exclude.sh	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/cddl/usr.sbin/dtrace/tests/tools/exclude.sh	Mon Oct 17 07:25:46 2016	(r307489)
@@ -72,6 +72,7 @@ exclude EXFAIL common/mib/tst.udp.ksh
 exclude SKIP common/privs/tst.fds.ksh
 exclude SKIP common/privs/tst.func_access.ksh
 exclude SKIP common/privs/tst.getf.ksh
+exclude SKIP common/privs/tst.kpriv.ksh
 exclude SKIP common/privs/tst.op_access.ksh
 exclude SKIP common/privs/tst.procpriv.ksh
 exclude SKIP common/privs/tst.providers.ksh

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/main.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/main.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/main.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -130,6 +130,13 @@ __FBSDID("$FreeBSD$");
 # include <crtdbg.h>
 #endif
 
+mode_t umasked(mode_t expected_mode)
+{
+	mode_t mode = umask(0);
+	umask(mode);
+	return expected_mode & ~mode;
+}
+
 /* Path to working directory for current test */
 const char *testworkdir;
 #ifdef PROGRAM
@@ -1294,6 +1301,11 @@ assertion_file_time(const char *file, in
 	switch (type) {
 	case 'a': filet_nsec = st.st_atimespec.tv_nsec; break;
 	case 'b': filet = st.st_birthtime;
+		/* FreeBSD filesystems that don't support birthtime
+		 * (e.g., UFS1) always return -1 here. */
+		if (filet == -1) {
+			return (1);
+		}
 		filet_nsec = st.st_birthtimespec.tv_nsec; break;
 	case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break;
 	default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type);
@@ -1425,7 +1437,7 @@ assertion_file_nlinks(const char *file, 
 	assertion_count(file, line);
 	r = lstat(pathname, &st);
 	if (r == 0 && (int)st.st_nlink == nlinks)
-			return (1);
+		return (1);
 	failure_start(file, line, "File %s has %d links, expected %d",
 	    pathname, st.st_nlink, nlinks);
 	failure_finish(NULL);
@@ -1661,6 +1673,7 @@ assertion_make_file(const char *file, in
 	if (0 != chmod(path, mode)) {
 		failure_start(file, line, "Could not chmod %s", path);
 		failure_finish(NULL);
+		close(fd);
 		return (0);
 	}
 	if (contents != NULL) {
@@ -1675,6 +1688,7 @@ assertion_make_file(const char *file, in
 			failure_start(file, line,
 			    "Could not write to %s", path);
 			failure_finish(NULL);
+			close(fd);
 			return (0);
 		}
 	}

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/test.h
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/test.h	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/cpio/test/test.h	Mon Oct 17 07:25:46 2016	(r307489)
@@ -182,6 +182,8 @@
   assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks)
 #define assertFileSize(pathname, size)  \
   assertion_file_size(__FILE__, __LINE__, pathname, size)
+#define assertFileMode(pathname, mode)  \
+  assertion_file_mode(__FILE__, __LINE__, pathname, mode)
 #define assertTextFileContents(text, pathname) \
   assertion_text_file_contents(__FILE__, __LINE__, text, pathname)
 #define assertFileContainsLinesAnyOrder(pathname, lines)	\
@@ -327,6 +329,9 @@ void copy_reference_file(const char *);
  */
 void extract_reference_files(const char **);
 
+/* Subtract umask from mode */
+mode_t umasked(mode_t expected_mode);
+
 /* Path to working directory for current test */
 extern const char *testworkdir;
 

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -627,7 +627,6 @@ translate_acl(struct archive_read_disk *
 		archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
 		    "Unknown ACL brand");
 		return (ARCHIVE_WARN);
-		break;
 	}
 #endif
 

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_set_standard_lookup.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -232,6 +232,7 @@ static const char *
 lookup_uname_helper(struct name_cache *cache, id_t id)
 {
 	struct passwd	*result;
+	(void)cache; /* UNUSED */
 
 	result = getpwuid((uid_t)id);
 
@@ -298,6 +299,7 @@ static const char *
 lookup_gname_helper(struct name_cache *cache, id_t id)
 {
 	struct group	*result;
+	(void)cache; /* UNUSED */
 
 	result = getgrgid((gid_t)id);
 

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/main.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/main.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/main.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -128,6 +128,13 @@ __FBSDID("$FreeBSD$");
 # include <crtdbg.h>
 #endif
 
+mode_t umasked(mode_t expected_mode)
+{
+	mode_t mode = umask(0);
+	umask(mode);
+	return expected_mode & ~mode;
+}
+
 /* Path to working directory for current test */
 const char *testworkdir;
 #ifdef PROGRAM
@@ -1364,6 +1371,31 @@ assertion_file_birthtime_recent(const ch
 	return assertion_file_time(file, line, pathname, 0, 0, 'b', 1);
 }
 
+/* Verify mode of 'pathname'. */
+int
+assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
+{
+	int mode;
+	int r;
+
+	assertion_count(file, line);
+#if defined(_WIN32) && !defined(__CYGWIN__)
+	failure_start(file, line, "assertFileMode not yet implemented for Windows");
+#else
+	{
+		struct stat st;
+		r = lstat(pathname, &st);
+		mode = (int)(st.st_mode & 0777);
+	}
+	if (r == 0 && mode == expected_mode)
+			return (1);
+	failure_start(file, line, "File %s has mode %o, expected %o",
+	    pathname, mode, expected_mode);
+#endif
+	failure_finish(NULL);
+	return (0);
+}
+
 /* Verify mtime of 'pathname'. */
 int
 assertion_file_mtime(const char *file, int line,
@@ -1403,7 +1435,7 @@ assertion_file_nlinks(const char *file, 
 	assertion_count(file, line);
 	r = lstat(pathname, &st);
 	if (r == 0 && (int)st.st_nlink == nlinks)
-			return (1);
+		return (1);
 	failure_start(file, line, "File %s has %d links, expected %d",
 	    pathname, st.st_nlink, nlinks);
 	failure_finish(NULL);
@@ -1440,31 +1472,6 @@ assertion_file_size(const char *file, in
 	return (0);
 }
 
-/* Verify mode of 'pathname'. */
-int
-assertion_file_mode(const char *file, int line, const char *pathname, int expected_mode)
-{
-	int mode;
-	int r;
-
-	assertion_count(file, line);
-#if defined(_WIN32) && !defined(__CYGWIN__)
-	failure_start(file, line, "assertFileMode not yet implemented for Windows");
-#else
-	{
-		struct stat st;
-		r = lstat(pathname, &st);
-		mode = (int)(st.st_mode & 0777);
-	}
-	if (r == 0 && mode == expected_mode)
-			return (1);
-	failure_start(file, line, "File %s has mode %o, expected %o",
-	    pathname, mode, expected_mode);
-#endif
-	failure_finish(NULL);
-	return (0);
-}
-
 /* Assert that 'pathname' is a dir.  If mode >= 0, verify that too. */
 int
 assertion_is_dir(const char *file, int line, const char *pathname, int mode)
@@ -1664,6 +1671,7 @@ assertion_make_file(const char *file, in
 	if (0 != chmod(path, mode)) {
 		failure_start(file, line, "Could not chmod %s", path);
 		failure_finish(NULL);
+		close(fd);
 		return (0);
 	}
 	if (contents != NULL) {
@@ -1678,6 +1686,7 @@ assertion_make_file(const char *file, in
 			failure_start(file, line,
 			    "Could not write to %s", path);
 			failure_finish(NULL);
+			close(fd);
 			return (0);
 		}
 	}

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test.h
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test.h	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test.h	Mon Oct 17 07:25:46 2016	(r307489)
@@ -243,12 +243,12 @@ int assertion_file_birthtime_recent(cons
 int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
 int assertion_file_contents(const char *, int, const void *, int, const char *);
 int assertion_file_exists(const char *, int, const char *);
+int assertion_file_mode(const char *, int, const char *, int);
 int assertion_file_mtime(const char *, int, const char *, long, long);
 int assertion_file_mtime_recent(const char *, int, const char *);
 int assertion_file_nlinks(const char *, int, const char *, int);
 int assertion_file_not_exists(const char *, int, const char *);
 int assertion_file_size(const char *, int, const char *, long);
-int assertion_file_mode(const char *, int, const char *, int);
 int assertion_is_dir(const char *, int, const char *, int);
 int assertion_is_hardlink(const char *, int, const char *, const char *);
 int assertion_is_not_hardlink(const char *, int, const char *, const char *);
@@ -329,6 +329,9 @@ void copy_reference_file(const char *);
  */
 void extract_reference_files(const char **);
 
+/* Subtract umask from mode */
+mode_t umasked(mode_t expected_mode);
+
 /* Path to working directory for current test */
 extern const char *testworkdir;
 

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_set_format.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_set_format.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_read_set_format.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -200,6 +200,8 @@ DEFINE_TEST(test_read_append_filter_wron
 {
   struct archive_entry *ae;
   struct archive *a;
+  int fd;
+  fpos_t pos;
 
   /*
    * If we have "bunzip2 -q", try using that.
@@ -208,6 +210,13 @@ DEFINE_TEST(test_read_append_filter_wron
     skipping("Can't run bunzip2 program on this platform");
     return;
   }
+
+  /* bunzip2 will write to stderr, redirect it to a file */
+  fflush(stderr);
+  fgetpos(stderr, &pos);
+  fd = dup(fileno(stderr));
+  freopen("stderr1", "w", stderr);
+
   assert((a = archive_read_new()) != NULL);
   assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR));
   assertEqualIntA(a, ARCHIVE_OK,
@@ -217,4 +226,13 @@ DEFINE_TEST(test_read_append_filter_wron
   assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN));
   assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a));
   assertEqualInt(ARCHIVE_OK, archive_read_free(a));
+
+  /* restore stderr */
+  fflush(stderr);
+  dup2(fd, fileno(stderr));
+  close(fd);
+  clearerr(stderr);
+  fsetpos(stderr, &pos);
+
+  assertTextFileContents("bunzip2: (stdin) is not a bzip2 file.\n", "stderr1");
 }

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/main.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/main.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/main.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -1164,6 +1164,35 @@ assertion_file_contains_lines_any_order(
 	return (0);
 }
 
+/* Verify that a text file does not contains the specified strings */
+int
+assertion_file_contains_no_invalid_strings(const char *file, int line,
+    const char *pathname, const char *strings[])
+{
+	char *buff;
+	int i;
+
+	buff = slurpfile(NULL, "%s", pathname);
+	if (buff == NULL) {
+		failure_start(file, line, "Can't read file: %s", pathname);
+		failure_finish(NULL);
+		return (0);
+	}
+
+	for (i = 0; strings[i] != NULL; ++i) {
+		if (strstr(buff, strings[i]) != NULL) {
+			failure_start(file, line, "Invalid string in %s: %s", pathname,
+			    strings[i]);
+			failure_finish(NULL);
+			free(buff);
+			return(0);
+		}
+	}
+	
+	free(buff);
+	return (0);
+}
+
 /* Test that two paths point to the same file. */
 /* As a side-effect, asserts that both files exist. */
 static int
@@ -1301,6 +1330,11 @@ assertion_file_time(const char *file, in
 	switch (type) {
 	case 'a': filet_nsec = st.st_atimespec.tv_nsec; break;
 	case 'b': filet = st.st_birthtime;
+		/* FreeBSD filesystems that don't support birthtime
+		 * (e.g., UFS1) always return -1 here. */
+		if (filet == -1) {
+			return (1);
+		}
 		filet_nsec = st.st_birthtimespec.tv_nsec; break;
 	case 'm': filet_nsec = st.st_mtimespec.tv_nsec; break;
 	default: fprintf(stderr, "INTERNAL: Bad type %c for file time", type);
@@ -1432,7 +1466,7 @@ assertion_file_nlinks(const char *file, 
 	assertion_count(file, line);
 	r = lstat(pathname, &st);
 	if (r == 0 && (int)st.st_nlink == nlinks)
-			return (1);
+		return (1);
 	failure_start(file, line, "File %s has %d links, expected %d",
 	    pathname, st.st_nlink, nlinks);
 	failure_finish(NULL);
@@ -1668,6 +1702,7 @@ assertion_make_file(const char *file, in
 	if (0 != chmod(path, mode)) {
 		failure_start(file, line, "Could not chmod %s", path);
 		failure_finish(NULL);
+		close(fd);
 		return (0);
 	}
 	if (contents != NULL) {
@@ -1682,6 +1717,7 @@ assertion_make_file(const char *file, in
 			failure_start(file, line,
 			    "Could not write to %s", path);
 			failure_finish(NULL);
+			close(fd);
 			return (0);
 		}
 	}

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test.h
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test.h	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test.h	Mon Oct 17 07:25:46 2016	(r307489)
@@ -174,6 +174,9 @@
 /* Assert that file contents match a string. */
 #define assertFileContents(data, data_size, pathname) \
   assertion_file_contents(__FILE__, __LINE__, data, data_size, pathname)
+/* Verify that a file does not contain invalid strings */
+#define assertFileContainsNoInvalidStrings(pathname, strings) \
+  assertion_file_contains_no_invalid_strings(__FILE__, __LINE__, pathname, strings)
 #define assertFileMtime(pathname, sec, nsec)	\
   assertion_file_mtime(__FILE__, __LINE__, pathname, sec, nsec)
 #define assertFileMtimeRecent(pathname) \
@@ -182,6 +185,8 @@
   assertion_file_nlinks(__FILE__, __LINE__, pathname, nlinks)
 #define assertFileSize(pathname, size)  \
   assertion_file_size(__FILE__, __LINE__, pathname, size)
+#define assertFileMode(pathname, mode)  \
+  assertion_file_mode(__FILE__, __LINE__, pathname, mode)
 #define assertTextFileContents(text, pathname) \
   assertion_text_file_contents(__FILE__, __LINE__, text, pathname)
 #define assertFileContainsLinesAnyOrder(pathname, lines)	\
@@ -239,6 +244,7 @@ int assertion_file_atime_recent(const ch
 int assertion_file_birthtime(const char *, int, const char *, long, long);
 int assertion_file_birthtime_recent(const char *, int, const char *);
 int assertion_file_contains_lines_any_order(const char *, int, const char *, const char **);
+int assertion_file_contains_no_invalid_strings(const char *, int, const char *, const char **); 
 int assertion_file_contents(const char *, int, const void *, int, const char *);
 int assertion_file_exists(const char *, int, const char *);
 int assertion_file_mode(const char *, int, const char *, int);

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_missing_file.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_missing_file.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/tar/test/test_missing_file.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -27,11 +27,15 @@ __FBSDID("$FreeBSD$");
 
 DEFINE_TEST(test_missing_file)
 {
+	const char * invalid_stderr[] = { "INTERNAL ERROR", NULL };
 	assertMakeFile("file1", 0644, "file1");
 	assertMakeFile("file2", 0644, "file2");
 	assert(0 == systemf("%s -cf archive.tar file1 file2 2>stderr1", testprog));
 	assertEmptyFile("stderr1");
 	assert(0 != systemf("%s -cf archive.tar file1 file2 file3 2>stderr2", testprog));
+	assertFileContainsNoInvalidStrings("stderr2", invalid_stderr);
 	assert(0 != systemf("%s -cf archive.tar 2>stderr3", testprog));
-	assert(0 != systemf("%s -cf archive.tar file3 2>stderr4", testprog));
+	assertFileContainsNoInvalidStrings("stderr3", invalid_stderr);
+	assert(0 != systemf("%s -cf archive.tar file3 file4 2>stderr4", testprog));
+	assertFileContainsNoInvalidStrings("stderr4", invalid_stderr);
 }

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/h_tools.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/h_tools.c	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/h_tools.c	Mon Oct 17 07:25:46 2016	(r307489)
@@ -50,6 +50,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
+#include <inttypes.h>
+#endif
+
 /* --------------------------------------------------------------------- */
 
 static int getfh_main(int, char **);
@@ -70,7 +74,12 @@ getfh_main(int argc, char **argv)
 	if (argc < 2)
 		return EXIT_FAILURE;
 
+#ifdef __FreeBSD__
+	fh_size = sizeof(fhandle_t);
+#else
 	fh_size = 0;
+#endif
+
 	fh = NULL;
 	for (;;) {
 		if (fh_size) {
@@ -85,7 +94,11 @@ getfh_main(int argc, char **argv)
 		 * but it may change if someone moves things around,
 		 * so retry untill we have enough memory.
 		 */
+#ifdef __FreeBSD__
+		error = getfh(argv[1], fh);
+#else
 		error = getfh(argv[1], fh, &fh_size);
+#endif
 		if (error == 0) {
 			break;
 		} else {

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_mount.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_mount.sh	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_mount.sh	Mon Oct 17 07:25:46 2016	(r307489)
@@ -93,7 +93,18 @@ negative_body() {
 	test_unmount
 }
 
+# Begin FreeBSD
+if true; then
+atf_test_case large cleanup
+large_cleanup() {
+	umount -f tmp 2>/dev/null
+}
+else
+# End FreeBSD
 atf_test_case large
+# Begin FreeBSD
+fi
+# End FreeBSD
 large_head() {
 	atf_set "descr" "Tests that extremely long values passed to -s" \
 	                "are handled correctly"
@@ -103,6 +114,10 @@ large_body() {
 	test_mount -o -s9223372036854775807
 	test_unmount
 
+	# Begin FreeBSD
+	atf_expect_fail "-o -s<large-size> succeeds unexpectedly on FreeBSD - bug 212862"
+	# End FreeBSD
+
 	mkdir tmp
 	atf_check -s eq:1 -o empty -e ignore \
 	    mount -t tmpfs -o -s9223372036854775808 tmpfs tmp

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_remove.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_remove.sh	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/fs/tmpfs/t_remove.sh	Mon Oct 17 07:25:46 2016	(r307489)
@@ -46,13 +46,28 @@ single_body() {
 	test_unmount
 }
 
+# Begin FreeBSD
+if true; then
+atf_test_case uchg cleanup
+uchg_cleanup() {
+	Mount_Point=$(pwd)/mntpt test_unmount || :
+}
+else
+# End FreeBSD
 atf_test_case uchg
+# Begin FreeBSD
+fi
+# End FreeBSD
 uchg_head() {
 	atf_set "descr" "Checks that files with the uchg flag set cannot" \
 	                "be removed"
 	atf_set "require.user" "root"
 }
 uchg_body() {
+	# Begin FreeBSD
+	atf_expect_fail "this fails on FreeBSD with root - bug 212861"
+	# End FreeBSD
+
 	test_mount
 
 	atf_check -s eq:0 -o empty -e empty touch a

Modified: user/alc/PQ_LAUNDRY/etc/defaults/rc.conf
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/defaults/rc.conf	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/defaults/rc.conf	Mon Oct 17 07:25:46 2016	(r307489)
@@ -695,6 +695,7 @@ iovctl_files=""		# Config files for iovc
 ### Jail Configuration (see rc.conf(5) manual page) ##########
 ##############################################################
 jail_enable="NO"	# Set to NO to disable starting of any jails
+jail_confwarn="YES"	# Prevent warning about obsolete per-jail configuration
 jail_parallel_start="NO"	# Start jails in the background
 jail_list=""		# Space separated list of names of jails
 jail_reverse_stop="NO"	# Stop jails in reverse order

Modified: user/alc/PQ_LAUNDRY/etc/mtree/BSD.usr.dist
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/mtree/BSD.usr.dist	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/mtree/BSD.usr.dist	Mon Oct 17 07:25:46 2016	(r307489)
@@ -228,8 +228,6 @@
                 ..
                 12.make
                 ..
-                13.rcs
-                ..
                 15.yacc
                 ..
                 16.lex

Modified: user/alc/PQ_LAUNDRY/etc/rc
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/rc	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/rc	Mon Oct 17 07:25:46 2016	(r307489)
@@ -135,16 +135,16 @@ done
 # Note: this assumes firstboot_sentinel is on / when we have
 # a read-only /, or that it is on media that's writable.
 if [ -e ${firstboot_sentinel} ]; then
-	[ ${root_rw_mount} = "yes" ] || mount -uw /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -uw /
 	chflags -R 0 ${firstboot_sentinel}
 	rm -rf ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
 		chflags -R 0 ${firstboot_sentinel}-reboot
 		rm -rf ${firstboot_sentinel}-reboot
-		[ ${root_rw_mount} = "yes" ] || mount -ur /
+		[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 		kill -INT 1
 	fi
-	[ ${root_rw_mount} = "yes" ] || mount -ur /
+	[ ${root_rw_mount#[Yy][Ee][Ss]} = "" ] || mount -ur /
 fi
 
 echo ''

Modified: user/alc/PQ_LAUNDRY/etc/rc.d/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/rc.d/Makefile	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/rc.d/Makefile	Mon Oct 17 07:25:46 2016	(r307489)
@@ -314,6 +314,7 @@ FILES+=		wpa_supplicant
 .if ${MK_ZFS} != "no"
 FILESGROUPS+=	ZFS
 ZFS+=		zfs
+ZFS+=		zfsbe
 ZFS+=		zfsd
 ZFS+=		zvol
 ZFSPACKAGE=	zfs

Modified: user/alc/PQ_LAUNDRY/etc/rc.d/jail
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/rc.d/jail	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/rc.d/jail	Mon Oct 17 07:25:46 2016	(r307489)
@@ -147,7 +147,8 @@ parse_options()
 	#
 	# To relieve confusion, show a warning message.
 	#
-	_confwarn=1
+	: ${jail_confwarn:=YES}
+	checkyesno jail_confwarn && _confwarn=1
 	if [ -r "$jail_conf" -o -r "$_jconf" ]; then
 		if ! checkyesno jail_parallel_start; then
 			warn "$_conf is created and used for jail $_j."

Modified: user/alc/PQ_LAUNDRY/etc/rc.d/zfs
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/rc.d/zfs	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/etc/rc.d/zfs	Mon Oct 17 07:25:46 2016	(r307489)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: zfs
-# REQUIRE: mountcritlocal
+# REQUIRE: zfsbe
 # BEFORE: FILESYSTEMS var
 
 . /etc/rc.subr

Copied: user/alc/PQ_LAUNDRY/etc/rc.d/zfsbe (from r307488, head/etc/rc.d/zfsbe)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/etc/rc.d/zfsbe	Mon Oct 17 07:25:46 2016	(r307489, copy of r307488, head/etc/rc.d/zfsbe)
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: zfsbe
+# REQUIRE: mountcritlocal
+
+# Handle boot environment subordinate filesystems
+# that may have canmount property set to noauto.
+# For these filesystems mountpoint relative to /
+# must be the same as their dataset name relative
+# to BE root dataset.
+
+. /etc/rc.subr
+
+name="zfsbe"
+rcvar="zfs_enable"
+start_cmd="be_start"
+stop_cmd="be_stop"
+required_modules="zfs"
+
+mount_subordinate()
+{
+	local _be
+
+	_be=$1
+	zfs list -rH -o mountpoint,name,canmount,mounted -s mountpoint -t filesystem $_be | \
+	while read _mp _name _canmount _mounted ; do
+		# skip filesystems that must not be mounted
+		[ "$_canmount" = "off" ] && continue
+		# skip filesystems that are already mounted
+		[ "$_mounted" = "yes" ] && continue
+		case "$_mp" in
+		"none" | "legacy" | "/" | "/$_be")
+			# do nothing for filesystems with unset or legacy mountpoint
+			# or those that would be mounted over /
+			;;
+		"/$_be/"*)
+			# filesystems with mountpoint relative to BE
+			mount -t zfs $_name ${_mp#/$_be}
+			;;
+		*)
+			# filesystems with mountpoint elsewhere
+			zfs mount $_name
+			;;
+		esac
+	done
+}
+
+be_start()
+{
+	if [ `$SYSCTL_N security.jail.jailed` -eq 1 ]; then
+		:
+	else
+		mount -p | while read _dev _mp _type _rest; do
+			[ $_mp  = "/" ] || continue
+			if [ $_type = "zfs" ] ; then
+				mount_subordinate $_dev
+			fi
+			break
+		done
+	fi
+}
+
+be_stop()
+{
+}
+
+load_rc_config $name
+run_rc_command "$1"

Modified: user/alc/PQ_LAUNDRY/gnu/usr.bin/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/gnu/usr.bin/Makefile	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/gnu/usr.bin/Makefile	Mon Oct 17 07:25:46 2016	(r307489)
@@ -11,7 +11,6 @@ SUBDIR= ${_binutils} \
 	${_gperf} \
 	grep \
 	${_groff} \
-	${_rcs} \
 	${_tests}
 
 SUBDIR_DEPEND_gdb= ${_binutils}
@@ -29,10 +28,6 @@ _groff=		groff
 _dtc=		dtc
 .endif
 
-.if ${MK_RCS} != "no"
-_rcs=		rcs
-.endif
-
 .if ${MK_TESTS} != "no"
 _tests=		tests
 .endif

Modified: user/alc/PQ_LAUNDRY/gnu/usr.bin/groff/mdate.sh
==============================================================================
--- user/alc/PQ_LAUNDRY/gnu/usr.bin/groff/mdate.sh	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/gnu/usr.bin/groff/mdate.sh	Mon Oct 17 07:25:46 2016	(r307489)
@@ -4,6 +4,5 @@
 set -e
 test -r "$1"
 export LC_ALL=C
-changelog_date=$(sed -E -n 's/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1" |\
-    head -n 1)
+changelog_date=$(sed -E -n '1s/^([0-9]{4}-[0-9]{2}-[0-9]{2}).*$/\1/p' "$1")
 echo $(date -j -f %Y-%m-%d +"%e %B %Y" $changelog_date)

Modified: user/alc/PQ_LAUNDRY/include/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/include/Makefile	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/include/Makefile	Mon Oct 17 07:25:46 2016	(r307489)
@@ -237,6 +237,17 @@ copies: .PHONY .META
 	cd ${.CURDIR}/../sys/teken; \
 	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
 	    ${DESTDIR}${INCLUDEDIR}/teken
+.if ${MK_CDDL} != "no"
+	cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libzfs_core/common; \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libzfs_core.h \
+	    ${DESTDIR}${INCLUDEDIR}
+	cd ${.CURDIR}/../cddl/contrib/opensolaris/lib/libnvpair; \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 libnvpair.h \
+	    ${DESTDIR}${INCLUDEDIR}
+	cd ${.CURDIR}/../sys/cddl/contrib/opensolaris/uts/common/sys; \
+	${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 nvpair.h \
+	    ${DESTDIR}${INCLUDEDIR}/sys
+.endif
 
 symlinks: .PHONY .META
 	@${ECHO} "Setting up symlinks to kernel source tree..."

Modified: user/alc/PQ_LAUNDRY/include/search.h
==============================================================================
--- user/alc/PQ_LAUNDRY/include/search.h	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/include/search.h	Mon Oct 17 07:25:46 2016	(r307489)
@@ -34,16 +34,18 @@ typedef	enum {
 } VISIT;
 
 #ifdef _SEARCH_PRIVATE
-typedef	struct node {
-	void         *key;
-	struct node  *llink, *rlink;
-	signed char   balance;
-} node_t;
+typedef struct __posix_tnode {
+	void			*key;
+	struct __posix_tnode	*llink, *rlink;
+	signed char		 balance;
+} posix_tnode;
 
 struct que_elem {
 	struct que_elem *next;
 	struct que_elem *prev;
 };
+#else
+typedef void posix_tnode;
 #endif
 
 #if __BSD_VISIBLE
@@ -62,12 +64,15 @@ void	*lfind(const void *, const void *, 
 void	*lsearch(const void *, void *, size_t *, size_t,
 	    int (*)(const void *, const void *));
 void	 remque(void *);
-void	*tdelete(const void * __restrict, void ** __restrict,
+void	*tdelete(const void * __restrict, posix_tnode ** __restrict,
 	    int (*)(const void *, const void *));
-void	*tfind(const void *, void * const *,
+posix_tnode *
+	 tfind(const void *, posix_tnode * const *,
 	    int (*)(const void *, const void *));
-void	*tsearch(const void *, void **, int (*)(const void *, const void *));
-void	 twalk(const void *, void (*)(const void *, VISIT, int));
+posix_tnode *
+	 tsearch(const void *, posix_tnode **,
+	    int (*)(const void *, const void *));
+void	 twalk(const posix_tnode *, void (*)(const posix_tnode *, VISIT, int));
 
 #if __BSD_VISIBLE
 int	 hcreate_r(size_t, struct hsearch_data *);

Modified: user/alc/PQ_LAUNDRY/lib/Makefile
==============================================================================
--- user/alc/PQ_LAUNDRY/lib/Makefile	Mon Oct 17 07:23:07 2016	(r307488)
+++ user/alc/PQ_LAUNDRY/lib/Makefile	Mon Oct 17 07:25:46 2016	(r307489)
@@ -26,114 +26,76 @@ SUBDIR=	${SUBDIR_BOOTSTRAP} \
 	.WAIT \
 	libalias \
 	libarchive \
-	${_libatm} \
 	libauditd \
 	libbegemot \
-	${_libblacklist} \
 	libblocksruntime \
-	${_libbluetooth} \
-	${_libbsnmp} \
 	libbsdstat \
 	libbsm \
 	libbz2 \
 	libcalendar \
 	libcam \
 	libcapsicum \
-	${_libcasper} \
-	${_libcom_err} \
 	libcompat \
 	libcrypt \
 	libdevctl \
-	${_libdevdctl} \
 	libdevinfo \
 	libdevstat \
 	libdwarf \
 	libedit \
-	${_libelftc} \
 	libevent \
 	libexecinfo \
 	libexpat \
 	libfetch \
 	libfigpar \
 	libgeom \
-	${_libgpio} \
-	${_libgssapi} \
-	${_librpcsec_gss} \
-	${_libiconv_modules} \
 	libifconfig \
 	libipsec \
 	libjail \
 	libkiconv \
 	libkvm \
-	${_libldns} \
 	liblzma \
-	${_libmagic} \
 	libmemstat \
 	libmd \
-	${_libmilter} \
-	${_libmp} \
 	libmt \
-	${_libnandfs} \
 	lib80211 \
 	libnetbsd \
-	${_libnetgraph} \
-	${_libngatm} \
 	libnv \
 	libopenbsd \
 	libopie \
 	libpam \
 	libpcap \
-	${_libpe} \
 	libpjdlog \
-	${_libpmc} \
 	${_libproc} \
 	libprocstat \
-	${_libradius} \
 	librpcsvc \
 	librss \
 	librt \
 	${_librtld_db} \
 	libsbuf \
-	${_libsdp} \
-	${_libsm} \
 	libsmb \
-	${_libsmdb} \
-	${_libsmutil} \
 	libsqlite3 \
 	libstand \
 	libstdbuf \
 	libstdthreads \
 	libsysdecode \
 	libtacplus \
-	${_libtelnet} \
-	${_libthr} \
 	libthread_db \
 	libucl \
 	libufs \
 	libugidfw \
 	libulog \
-	${_libunbound} \
-	${_libusbhid} \
-	${_libusb} \
 	libutil \
 	${_libvgl} \
-	${_libvmmapi} \
 	libwrap \
 	libxo \

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

More information about the svn-src-user mailing list