svn commit: r305510 - in user/alc/PQ_LAUNDRY: . contrib/gcclibs/libcpp contrib/libarchive contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/netbsd-tests/kernel/kqueue contrib...

Wed Sep 7 00:34:49 UTC 2016

Author: markj
Date: Wed Sep  7 00:34:45 2016
New Revision: 305510
URL: https://svnweb.freebsd.org/changeset/base/305510

Log:
  MFH r305509

Added:
  user/alc/PQ_LAUNDRY/contrib/libarchive/README.md
     - copied unchanged from r305509, head/contrib/libarchive/README.md
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_25g.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_25g.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_25g.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_25g.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_25g_internal_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_25g_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_hssp.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_hssp.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_internal_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_hssp_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes_interface.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_hal_serdes_interface.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_serdes.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_serdes.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_serdes.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/al_serdes.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_common.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_common.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_iofic.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_iofic.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_iofic.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_iofic.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_iofic_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_nb_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pbs_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie_axi_reg.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie_interrupts.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_pcie_w_reg.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_plat_services.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_plat_services.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_plat_types.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_plat_types.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_reg_utils.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_internal_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_25g_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_internal_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_hssp_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_interface.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_internal_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_serdes_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_types.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_types.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_config.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_config.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_config.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_debug.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_iofic_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_main.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_main.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_gen.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_m2s.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_udma_regs_s2m.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_hal_unit_adapter_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_serdes.c
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_serdes.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_serdes.h
     - copied unchanged from r305509, head/sys/contrib/alpine-hal/eth/al_serdes.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/eth/
     - copied from r305509, head/sys/contrib/alpine-hal/eth/eth/
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/cores/usb/
     - copied from r305509, head/sys/dev/bhnd/cores/usb/
  user/alc/PQ_LAUNDRY/sys/dev/cpufreq/cpufreq_dt.c
     - copied unchanged from r305509, head/sys/dev/cpufreq/cpufreq_dt.c
  user/alc/PQ_LAUNDRY/sys/dev/iicbus/sy8106a.c
     - copied unchanged from r305509, head/sys/dev/iicbus/sy8106a.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/libkqueue/
     - copied from r305509, head/tests/sys/kqueue/libkqueue/
Replaced:
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/Makefile
     - copied unchanged from r305509, head/tests/sys/kqueue/Makefile
Deleted:
  user/alc/PQ_LAUNDRY/contrib/libarchive/README
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/Makefile.depend
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/common.h
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/config.h
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/kqueue_test.sh
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/main.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/proc.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/read.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/signal.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/timer.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/user.c
  user/alc/PQ_LAUNDRY/tests/sys/kqueue/vnode.c
Modified:
  user/alc/PQ_LAUNDRY/ObsoleteFiles.inc
  user/alc/PQ_LAUNDRY/contrib/gcclibs/libcpp/system.h
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_acl.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_posix.c
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_sig.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
  user/alc/PQ_LAUNDRY/contrib/top/commands.c
  user/alc/PQ_LAUNDRY/contrib/top/machine.h
  user/alc/PQ_LAUNDRY/contrib/top/top.c
  user/alc/PQ_LAUNDRY/contrib/top/top.xs
  user/alc/PQ_LAUNDRY/etc/mtree/BSD.tests.dist
  user/alc/PQ_LAUNDRY/lib/libarchive/config_freebsd.h
  user/alc/PQ_LAUNDRY/lib/libc/stdio/fgets.c
  user/alc/PQ_LAUNDRY/lib/libc/stdio/fgetws.c
  user/alc/PQ_LAUNDRY/lib/libc/tests/db/Makefile
  user/alc/PQ_LAUNDRY/lib/libstand/ufs.c
  user/alc/PQ_LAUNDRY/share/man/man9/Makefile
  user/alc/PQ_LAUNDRY/share/man/man9/pci.9
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/machdep.c
  user/alc/PQ_LAUNDRY/sys/amd64/amd64/prof_machdep.c
  user/alc/PQ_LAUNDRY/sys/amd64/conf/NOTES
  user/alc/PQ_LAUNDRY/sys/amd64/vmm/io/iommu.c
  user/alc/PQ_LAUNDRY/sys/amd64/vmm/io/ppt.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/aw_thermal.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_pll.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/clk/aw_thsclk.c
  user/alc/PQ_LAUNDRY/sys/arm/allwinner/files.allwinner
  user/alc/PQ_LAUNDRY/sys/arm/arm/minidump_machdep.c
  user/alc/PQ_LAUNDRY/sys/arm/conf/ALLWINNER
  user/alc/PQ_LAUNDRY/sys/arm/ti/am335x/am335x_scm.h
  user/alc/PQ_LAUNDRY/sys/arm/ti/cpsw/if_cpsw.c
  user/alc/PQ_LAUNDRY/sys/arm/ti/cpsw/if_cpswreg.h
  user/alc/PQ_LAUNDRY/sys/arm/ti/ti_pruss.c
  user/alc/PQ_LAUNDRY/sys/arm64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/boot/efi/loader/copy.c
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/alc/PQ_LAUNDRY/sys/conf/files
  user/alc/PQ_LAUNDRY/sys/conf/files.arm
  user/alc/PQ_LAUNDRY/sys/conf/files.arm64
  user/alc/PQ_LAUNDRY/sys/conf/options.amd64
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_iofic.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_iofic.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_iofic_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_nb_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pbs_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie_axi_reg.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie_interrupts.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_pcie_w_reg.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_plat_services.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_plat_types.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_reg_utils.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_serdes.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_config.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_config.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_debug.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_iofic.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_main.c
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_udma_regs_gen.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/al_hal_unit_adapter_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_eth.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_eth_mac_regs.h
  user/alc/PQ_LAUNDRY/sys/contrib/alpine-hal/eth/al_hal_eth_main.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bcma/bcma.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bcma/bcma_dmp.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bcma/bcmavar.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_bus_if.m
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_nexus.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_subr.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhnd_types.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhnd_bhndb.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhndb.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhndb_pci.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/bhndb/bhndb_pcivar.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/siba/siba.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/siba/siba_bhndb.c
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/siba/sibareg.h
  user/alc/PQ_LAUNDRY/sys/dev/bhnd/siba/sibavar.h
  user/alc/PQ_LAUNDRY/sys/dev/bwn/bwn_mac.c
  user/alc/PQ_LAUNDRY/sys/dev/bwn/if_bwn_pci.c
  user/alc/PQ_LAUNDRY/sys/dev/bwn/if_bwn_pcivar.h
  user/alc/PQ_LAUNDRY/sys/dev/cxgbe/tom/t4_connect.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/hv_net_vsc.c
  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/hv_rndis_filter.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/netvsc/ndis.h
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_chan.c
  user/alc/PQ_LAUNDRY/sys/dev/hyperv/vmbus/vmbus_reg.h
  user/alc/PQ_LAUNDRY/sys/dev/iscsi/iscsi.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwm_scan.c
  user/alc/PQ_LAUNDRY/sys/dev/iwm/if_iwmreg.h
  user/alc/PQ_LAUNDRY/sys/dev/pci/pci.c
  user/alc/PQ_LAUNDRY/sys/dev/pci/pci_host_generic.c
  user/alc/PQ_LAUNDRY/sys/dev/pci/pci_host_generic.h
  user/alc/PQ_LAUNDRY/sys/dev/pci/pcireg.h
  user/alc/PQ_LAUNDRY/sys/dev/pci/pcivar.h
  user/alc/PQ_LAUNDRY/sys/dev/rtwn/if_rtwn.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/template/usb_template.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_device.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_device.h
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_generic.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_request.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_transfer.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/usb_util.c
  user/alc/PQ_LAUNDRY/sys/dev/usb/wlan/if_rum.c
  user/alc/PQ_LAUNDRY/sys/fs/nullfs/null_vnops.c
  user/alc/PQ_LAUNDRY/sys/geom/mirror/g_mirror.c
  user/alc/PQ_LAUNDRY/sys/kern/kern_condvar.c
  user/alc/PQ_LAUNDRY/sys/kern/kern_sig.c
  user/alc/PQ_LAUNDRY/sys/mips/broadcom/files.broadcom
  user/alc/PQ_LAUNDRY/sys/mips/conf/BCM
  user/alc/PQ_LAUNDRY/sys/net/rndis.h
  user/alc/PQ_LAUNDRY/sys/sparc64/conf/GENERIC
  user/alc/PQ_LAUNDRY/sys/sys/param.h
  user/alc/PQ_LAUNDRY/sys/ufs/ffs/fs.h
  user/alc/PQ_LAUNDRY/sys/ufs/ufs/dir.h
  user/alc/PQ_LAUNDRY/sys/x86/x86/cpu_machdep.c
  user/alc/PQ_LAUNDRY/usr.bin/bsdiff/bspatch/bspatch.c
  user/alc/PQ_LAUNDRY/usr.bin/top/machine.c
  user/alc/PQ_LAUNDRY/usr.sbin/acpi/acpidump/acpi.c
  user/alc/PQ_LAUNDRY/usr.sbin/bsdinstall/partedit/gpart_ops.c
  user/alc/PQ_LAUNDRY/usr.sbin/portsnap/portsnap/portsnap.sh
Directory Properties:
  user/alc/PQ_LAUNDRY/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/libarchive/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/netbsd-tests/   (props changed)
  user/alc/PQ_LAUNDRY/contrib/top/   (props changed)
  user/alc/PQ_LAUNDRY/sys/cddl/contrib/opensolaris/   (props changed)

Modified: user/alc/PQ_LAUNDRY/ObsoleteFiles.inc
==============================================================================

--- user/alc/PQ_LAUNDRY/ObsoleteFiles.inc	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/ObsoleteFiles.inc	Wed Sep  7 00:34:45 2016	(r305510)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue
+OLD_FILES+=usr/tests/sys/kqueue/kqtest
+OLD_FILES+=usr/tests/sys/kqueue/kqueue_test
 # 20160901: Remove digi(4)
 OLD_FILES+=usr/share/man/man4/digi.4.gz
 # 20160819: Remove ie(4)

Modified: user/alc/PQ_LAUNDRY/contrib/gcclibs/libcpp/system.h
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/gcclibs/libcpp/system.h	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/gcclibs/libcpp/system.h	Wed Sep  7 00:34:45 2016	(r305510)
@@ -347,9 +347,12 @@ extern void abort (void);
    ??? C99 designated initializers are not supported by most C++
    compilers, including G++.  -- gdr, 2005-05-18  */
 #if !defined(HAVE_DESIGNATED_INITIALIZERS)
-#define HAVE_DESIGNATED_INITIALIZERS \
-  ((!defined(__cplusplus) && (GCC_VERSION >= 2007)) \
-   || (__STDC_VERSION__ >= 199901L))
+# if (!defined(__cplusplus) && (GCC_VERSION >= 2007)) \
+     ||(__STDC_VERSION__ >= 199901L)
+#  define HAVE_DESIGNATED_INITIALIZERS 1
+# else
+#  define HAVE_DESIGNATED_INITIALIZERS 0
+# endif
 #endif
 
 /* Be conservative and only use enum bitfields with GCC.

Copied: user/alc/PQ_LAUNDRY/contrib/libarchive/README.md (from r305509, head/contrib/libarchive/README.md)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/README.md	Wed Sep  7 00:34:45 2016	(r305510, copy of r305509, head/contrib/libarchive/README.md)
@@ -0,0 +1,222 @@
+# Welcome to libarchive!
+
+The libarchive project develops a portable, efficient C library that
+can read and write streaming archives in a variety of formats.  It
+also includes implementations of the common `tar`, `cpio`, and `zcat`
+command-line tools that use the libarchive library.
+
+## Questions?  Issues?
+
+* http://www.libarchive.org is the home for ongoing
+  libarchive development, including documentation,
+  and links to the libarchive mailing lists.
+* To report an issue, use the issue tracker at
+  https://github.com/libarchive/libarchive/issues
+* To submit an enhancement to libarchive, please
+  submit a pull request via GitHub: https://github.com/libarchive/libarchive/pulls
+
+## Contents of the Distribution
+
+This distribution bundle includes the following major components:
+
+* **libarchive**: a library for reading and writing streaming archives
+* **tar**: the 'bsdtar' program is a full-featured 'tar' implementation built on libarchive
+* **cpio**: the 'bsdcpio' program is a different interface to essentially the same functionality
+* **cat**: the 'bsdcat' program is a simple replacement tool for zcat, bzcat, xzcat, and such
+* **examples**: Some small example programs that you may find useful.
+* **examples/minitar**: a compact sample demonstrating use of libarchive.
+* **contrib**:  Various items sent to me by third parties; please contact the authors with any questions.
+
+The top-level directory contains the following information files:
+
+* **NEWS** - highlights of recent changes
+* **COPYING** - what you can do with this
+* **INSTALL** - installation instructions
+* **README** - this file
+* **CMakeLists.txt** - input for "cmake" build tool, see INSTALL
+* **configure** - configuration script, see INSTALL for details.  If your copy of the source lacks a `configure` script, you can try to construct it by running the script in `build/autogen.sh` (or use `cmake`).
+
+The following files in the top-level directory are used by the 'configure' script:
+* `Makefile.am`, `aclocal.m4`, `configure.ac` - used to build this distribution, only needed by maintainers
+* `Makefile.in`, `config.h.in` - templates used by configure script
+
+## Documentation
+
+In addition to the informational articles and documentation
+in the online [libarchive Wiki](https://github.com/libarchive/libarchive/wiki),
+the distribution also includes a number of manual pages:
+
+ * bsdtar.1 explains the use of the bsdtar program
+ * bsdcpio.1 explains the use of the bsdcpio program
+ * bsdcat.1 explains the use of the bsdcat program
+ * libarchive.3 gives an overview of the library as a whole
+ * archive_read.3, archive_write.3, archive_write_disk.3, and
+   archive_read_disk.3 provide detailed calling sequences for the read
+   and write APIs
+ * archive_entry.3 details the "struct archive_entry" utility class
+ * archive_internals.3 provides some insight into libarchive's
+   internal structure and operation.
+ * libarchive-formats.5 documents the file formats supported by the library
+ * cpio.5, mtree.5, and tar.5 provide detailed information about these
+   popular archive formats, including hard-to-find details about
+   modern cpio and tar variants.
+
+The manual pages above are provided in the 'doc' directory in
+a number of different formats.
+
+You should also read the copious comments in `archive.h` and the
+source code for the sample programs for more details.  Please let us
+know about any errors or omissions you find.
+
+## Supported Formats
+
+Currently, the library automatically detects and reads the following fomats:
+  * Old V7 tar archives
+  * POSIX ustar
+  * GNU tar format (including GNU long filenames, long link names, and sparse files)
+  * Solaris 9 extended tar format (including ACLs)
+  * POSIX pax interchange format
+  * POSIX octet-oriented cpio
+  * SVR4 ASCII cpio
+  * POSIX octet-oriented cpio
+  * Binary cpio (big-endian or little-endian)
+  * ISO9660 CD-ROM images (with optional Rockridge or Joliet extensions)
+  * ZIP archives (with uncompressed or "deflate" compressed entries, including support for encrypted Zip archives)
+  * GNU and BSD 'ar' archives
+  * 'mtree' format
+  * 7-Zip archives
+  * Microsoft CAB format
+  * LHA and LZH archives
+  * RAR archives (with some limitations due to RAR's proprietary status)
+  * XAR archives
+
+The library also detects and handles any of the following before evaluating the archive:
+  * uuencoded files
+  * files with RPM wrapper
+  * gzip compression
+  * bzip2 compression
+  * compress/LZW compression
+  * lzma, lzip, and xz compression
+  * lz4 compression
+  * lzop compression
+
+The library can create archives in any of the following formats:
+  * POSIX ustar
+  * POSIX pax interchange format
+  * "restricted" pax format, which will create ustar archives except for
+    entries that require pax extensions (for long filenames, ACLs, etc).
+  * Old GNU tar format
+  * Old V7 tar format
+  * POSIX octet-oriented cpio
+  * SVR4 "newc" cpio
+  * shar archives
+  * ZIP archives (with uncompressed or "deflate" compressed entries)
+  * GNU and BSD 'ar' archives
+  * 'mtree' format
+  * ISO9660 format
+  * 7-Zip archives
+  * XAR archives
+
+When creating archives, the result can be filtered with any of the following:
+  * uuencode
+  * gzip compression
+  * bzip2 compression
+  * compress/LZW compression
+  * lzma, lzip, and xz compression
+  * lz4 compression
+  * lzop compression
+
+## Notes about the Library Design
+
+The following notes address many of the most common
+questions we are asked about libarchive:
+
+* This is a heavily stream-oriented system.  That means that
+  it is optimized to read or write the archive in a single
+  pass from beginning to end.  For example, this allows
+  libarchive to process archives too large to store on disk
+  by processing them on-the-fly as they are read from or
+  written to a network or tape drive.  This also makes
+  libarchive useful for tools that need to produce
+  archives on-the-fly (such as webservers that provide
+  archived contents of a users account).
+
+* In-place modification and random access to the contents
+  of an archive are not directly supported.  For some formats,
+  this is not an issue: For example, tar.gz archives are not
+  designed for random access.  In some other cases, libarchive
+  can re-open an archive and scan it from the beginning quickly
+  enough to provide the needed abilities even without true
+  random access.  Of course, some applications do require true
+  random access; those applications should consider alternatives
+  to libarchive.
+
+* The library is designed to be extended with new compression and
+  archive formats.  The only requirement is that the format be
+  readable or writable as a stream and that each archive entry be
+  independent.  There are articles on the libarchive Wiki explaining
+  how to extend libarchive.
+
+* On read, compression and format are always detected automatically.
+
+* The same API is used for all formats; in particular, it's very
+  easy for software using libarchive to transparently handle
+  any of libarchive's archiving formats.
+
+* Libarchive's automatic support for decompression can be used
+  without archiving by explicitly selecting the "raw" and "empty"
+  formats.
+
+* I've attempted to minimize static link pollution.  If you don't
+  explicitly invoke a particular feature (such as support for a
+  particular compression or format), it won't get pulled in to
+  statically-linked programs.  In particular, if you don't explicitly
+  enable a particular compression or decompression support, you won't
+  need to link against the corresponding compression or decompression
+  libraries.  This also reduces the size of statically-linked
+  binaries in environments where that matters.
+
+* The library is generally _thread safe_ depending on the platform:
+  it does not define any global variables of its own.  However, some
+  platforms do not provide fully thread-safe versions of key C library
+  functions.  On those platforms, libarchive will use the non-thread-safe
+  functions.  Patches to improve this are of great interest to us.
+
+* In particular, libarchive's modules to read or write a directory
+  tree do use `chdir()` to optimize the directory traversals.  This
+  can cause problems for programs that expect to do disk access from
+  multiple threads.  Of course, those modules are completely
+  optional and you can use the rest of libarchive without them.
+
+* The library is _not_ thread aware, however.  It does no locking
+  or thread management of any kind.  If you create a libarchive
+  object and need to access it from multiple threads, you will
+  need to provide your own locking.
+
+* On read, the library accepts whatever blocks you hand it.
+  Your read callback is free to pass the library a byte at a time
+  or mmap the entire archive and give it to the library at once.
+  On write, the library always produces correctly-blocked output.
+
+* The object-style approach allows you to have multiple archive streams
+  open at once.  bsdtar uses this in its "@archive" extension.
+
+* The archive itself is read/written using callback functions.
+  You can read an archive directly from an in-memory buffer or
+  write it to a socket, if you wish.  There are some utility
+  functions to provide easy-to-use "open file," etc, capabilities.
+
+* The read/write APIs are designed to allow individual entries
+  to be read or written to any data source:  You can create
+  a block of data in memory and add it to a tar archive without
+  first writing a temporary file.  You can also read an entry from
+  an archive and write the data directly to a socket.  If you want
+  to read/write entries to disk, there are convenience functions to
+  make this especially easy.
+
+* Note: The "pax interchange format" is a POSIX standard extended tar
+  format that should be used when the older _ustar_ format is not
+  appropriate.  It has many advantages over other tar formats
+  (including the legacy GNU tar format) and is widely supported by
+  current tar implementations.
+

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_acl.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_acl.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_acl.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -707,10 +707,11 @@ archive_acl_text_l(struct archive_acl *a
 			if (r != 0)
 				return (-1);
 			*p++ = separator;
-			if (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID)
+			if (name == NULL || (flags & ARCHIVE_ENTRY_ACL_STYLE_EXTRA_ID)) {
 				id = ap->id;
-			else
+			} else {
 				id = -1;
+			}
 			append_entry(&p, NULL, ap->tag, name,
 			    ap->permset, id);
 			count++;

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	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -419,12 +419,32 @@ setup_acls(struct archive_read_disk *a,
 	if (accpath == NULL)
 		accpath = archive_entry_pathname(entry);
 
+	if (*fd < 0 && a->tree != NULL) {
+		if (a->follow_symlinks ||
+		    archive_entry_filetype(entry) != AE_IFLNK)
+			*fd = a->open_on_current_dir(a->tree,
+			    accpath, O_RDONLY | O_NONBLOCK);
+		if (*fd < 0) {
+			if (a->tree_enter_working_dir(a->tree) != 0) {
+				archive_set_error(&a->archive, errno,
+				    "Couldn't access %s", accpath);
+				return (ARCHIVE_FAILED);
+			}
+		}
+	}
+
 	archive_entry_acl_clear(entry);
 
+	acl = NULL;
+
 #ifdef ACL_TYPE_NFS4
 	/* Try NFS4 ACL first. */
 	if (*fd >= 0)
+#if HAVE_ACL_GET_FD_NP
+		acl = acl_get_fd_np(*fd, ACL_TYPE_NFS4);
+#else
 		acl = acl_get_fd(*fd);
+#endif
 #if HAVE_ACL_GET_LINK_NP
 	else if (!a->follow_symlinks)
 		acl = acl_get_link_np(accpath, ACL_TYPE_NFS4);
@@ -437,12 +457,19 @@ setup_acls(struct archive_read_disk *a,
 #endif
 	else
 		acl = acl_get_file(accpath, ACL_TYPE_NFS4);
+
 #if HAVE_ACL_IS_TRIVIAL_NP
-	/* Ignore "trivial" ACLs that just mirror the file mode. */
-	acl_is_trivial_np(acl, &r);
-	if (r) {
-		acl_free(acl);
-		acl = NULL;
+	if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) {
+		/* Ignore "trivial" ACLs that just mirror the file mode. */
+		if (r) {
+			acl_free(acl);
+			acl = NULL;
+			/*
+			 * Simultaneous NFSv4 and POSIX.1e ACLs for the same
+			 * entry are not allowed, so we should return here
+			 */
+			return (ARCHIVE_OK);
+		}
 	}
 #endif
 	if (acl != NULL) {
@@ -450,7 +477,7 @@ setup_acls(struct archive_read_disk *a,
 		acl_free(acl);
 		return (ARCHIVE_OK);
 	}
-#endif
+#endif	/* ACL_TYPE_NFS4 */
 
 	/* Retrieve access ACL from file. */
 	if (*fd >= 0)
@@ -467,10 +494,22 @@ setup_acls(struct archive_read_disk *a,
 #endif
 	else
 		acl = acl_get_file(accpath, ACL_TYPE_ACCESS);
+
+#if HAVE_ACL_IS_TRIVIAL_NP
+	/* Ignore "trivial" ACLs that just mirror the file mode. */
+	if (acl != NULL && acl_is_trivial_np(acl, &r) == 0) {
+		if (r) {
+			acl_free(acl);
+			acl = NULL;
+		}
+	}
+#endif
+
 	if (acl != NULL) {
 		translate_acl(a, entry, acl,
 		    ARCHIVE_ENTRY_ACL_TYPE_ACCESS);
 		acl_free(acl);
+		acl = NULL;
 	}
 
 	/* Only directories can have default ACLs. */

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_posix.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_posix.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/archive_read_disk_posix.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -1504,10 +1504,19 @@ setup_current_filesystem(struct archive_
 	struct tree *t = a->tree;
 	struct statfs sfs;
 #if defined(HAVE_GETVFSBYNAME) && defined(VFCF_SYNTHETIC)
-#  if defined(HAVE_STRUCT_VFSCONF)
-	struct vfsconf vfc;
-#  else
+/* TODO: configure should set GETVFSBYNAME_ARG_TYPE to make
+ * this accurate; some platforms have both and we need the one that's
+ * used by getvfsbyname()
+ *
+ * Then the following would become:
+ *  #if defined(GETVFSBYNAME_ARG_TYPE)
+ *   GETVFSBYNAME_ARG_TYPE vfc;
+ *  #endif
+ */
+#  if defined(HAVE_STRUCT_XVFSCONF)
 	struct xvfsconf vfc;
+#  else
+	struct vfsconf vfc;
 #  endif
 #endif
 	int r, xr = 0;

Modified: user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -70,15 +70,9 @@ set_acls(struct archive_entry *ae, struc
 }
 
 static int
-acl_match(acl_entry_t aclent, struct myacl_t *myacl)
-{
-	gid_t g, *gp;
-	uid_t u, *up;
-	acl_tag_t tag_type;
-	acl_permset_t opaque_ps;
+acl_entry_get_perm(acl_entry_t aclent) {
 	int permset = 0;
-
-	acl_get_tag_type(aclent, &tag_type);
+	acl_permset_t opaque_ps;
 
 	/* translate the silly opaque permset to a bitmap */
 	acl_get_permset(aclent, &opaque_ps);
@@ -88,10 +82,61 @@ acl_match(acl_entry_t aclent, struct mya
 		permset |= ARCHIVE_ENTRY_ACL_WRITE;
 	if (acl_get_perm_np(opaque_ps, ACL_READ))
 		permset |= ARCHIVE_ENTRY_ACL_READ;
+	return permset;
+}
+
+#if 0
+static int
+acl_get_specific_entry(acl_t acl, acl_tag_t requested_tag_type, int requested_tag) {
+	int entry_id = ACL_FIRST_ENTRY;
+	acl_entry_t acl_entry;
+	acl_tag_t acl_tag_type;
+	
+	while (1 == acl_get_entry(acl, entry_id, &acl_entry)) {
+		/* After the first time... */
+		entry_id = ACL_NEXT_ENTRY;
+
+		/* If this matches, return perm mask */
+		acl_get_tag_type(acl_entry, &acl_tag_type);
+		if (acl_tag_type == requested_tag_type) {
+			switch (acl_tag_type) {
+			case ACL_USER_OBJ:
+				if ((uid_t)requested_tag == *(uid_t *)(acl_get_qualifier(acl_entry))) {
+					return acl_entry_get_perm(acl_entry);
+				}
+				break;
+			case ACL_GROUP_OBJ:
+				if ((gid_t)requested_tag == *(gid_t *)(acl_get_qualifier(acl_entry))) {
+					return acl_entry_get_perm(acl_entry);
+				}
+				break;
+			case ACL_USER:
+			case ACL_GROUP:
+			case ACL_OTHER:
+				return acl_entry_get_perm(acl_entry);
+			default:
+				failure("Unexpected ACL tag type");
+				assert(0);
+			}
+		}
+
 
-	if (permset != myacl->permset)
+	}
+	return -1;
+}
+#endif
+
+static int
+acl_match(acl_entry_t aclent, struct myacl_t *myacl)
+{
+	gid_t g, *gp;
+	uid_t u, *up;
+	acl_tag_t tag_type;
+
+	if (myacl->permset != acl_entry_get_perm(aclent))
 		return (0);
 
+	acl_get_tag_type(aclent, &tag_type);
 	switch (tag_type) {
 	case ACL_USER_OBJ:
 		if (myacl->tag != ARCHIVE_ENTRY_ACL_USER_OBJ) return (0);
@@ -190,7 +235,7 @@ compare_acls(acl_t acl, struct myacl_t *
  * Verify ACL restore-to-disk.  This test is FreeBSD-specific.
  */
 
-DEFINE_TEST(test_acl_freebsd_posix1e)
+DEFINE_TEST(test_acl_freebsd_posix1e_restore)
 {
 #if !defined(__FreeBSD__)
 	skipping("FreeBSD-specific ACL restore test");
@@ -263,3 +308,111 @@ DEFINE_TEST(test_acl_freebsd_posix1e)
 	acl_free(acl);
 #endif
 }
+
+/*
+ * Verify ACL reaed-from-disk.  This test is FreeBSD-specific.
+ */
+DEFINE_TEST(test_acl_freebsd_posix1e_read)
+{
+#if !defined(__FreeBSD__)
+	skipping("FreeBSD-specific ACL read test");
+#elif __FreeBSD__ < 5
+	skipping("ACL read supported only on FreeBSD 5.0 and later");
+#else
+	struct archive *a;
+	struct archive_entry *ae;
+	int n, fd;
+	const char *acl1_text, *acl2_text;
+	acl_t acl1, acl2;
+
+	/*
+	 * Manually construct a directory and two files with
+	 * different ACLs.  This also serves to verify that ACLs
+	 * are supported on the local filesystem.
+	 */
+
+	/* Create a test file f1 with acl1 */
+	acl1_text = "user::rwx,group::rwx,other::rwx,user:1:rw-,group:15:r-x,mask::rwx";
+	acl1 = acl_from_text(acl1_text);
+	assert((void *)acl1 != NULL);
+	fd = open("f1", O_WRONLY | O_CREAT | O_EXCL, 0777);
+	failure("Could not create test file?!");
+	if (!assert(fd >= 0)) {
+		acl_free(acl1);
+		return;
+	}
+	n = acl_set_fd(fd, acl1);
+	acl_free(acl1);
+	if (n != 0 && errno == EOPNOTSUPP) {
+		close(fd);
+		skipping("ACL tests require that ACL support be enabled on the filesystem");
+		return;
+	}
+	if (n != 0 && errno == EINVAL) {
+		close(fd);
+		skipping("This filesystem does not support POSIX.1e ACLs");
+		return;
+	}
+	failure("acl_set_fd(): errno = %d (%s)",
+	    errno, strerror(errno));
+	assertEqualInt(0, n);
+	close(fd);
+
+	assertMakeDir("d", 0700);
+
+	/*
+	 * Create file d/f1 with acl2
+	 *
+	 * This differs from acl1 in the u:1: and g:15: permissions.
+	 *
+	 * This file deliberately has the same name but a different ACL.
+	 * Github Issue #777 explains how libarchive's directory traversal
+	 * did not always correctly enter directories before attempting
+	 * to read ACLs, resulting in reading the ACL from a like-named
+	 * file in the wrong directory.
+	 */
+	acl2_text = "user::rwx,group::rwx,other::---,user:1:r--,group:15:r--,mask::rwx";
+	acl2 = acl_from_text(acl2_text);
+	assert((void *)acl2 != NULL);
+	fd = open("d/f1", O_WRONLY | O_CREAT | O_EXCL, 0777);
+	failure("Could not create test file?!");
+	if (!assert(fd >= 0)) {
+		acl_free(acl2);
+		return;
+	}
+	n = acl_set_fd(fd, acl2);
+	acl_free(acl2);
+	if (n != 0 && errno == EOPNOTSUPP) {
+		close(fd);
+		skipping("ACL tests require that ACL support be enabled on the filesystem");
+		return;
+	}
+	if (n != 0 && errno == EINVAL) {
+		close(fd);
+		skipping("This filesystem does not support POSIX.1e ACLs");
+		return;
+	}
+	failure("acl_set_fd(): errno = %d (%s)",
+	    errno, strerror(errno));
+	assertEqualInt(0, n);
+	close(fd);
+
+	/* Create a read-from-disk object. */
+	assert(NULL != (a = archive_read_disk_new()));
+	assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_open(a, "."));
+	assert(NULL != (ae = archive_entry_new()));
+
+	/* Walk the dir until we see both of the files */
+	while (ARCHIVE_OK == archive_read_next_header2(a, ae)) {
+		archive_read_disk_descend(a);
+		if (strcmp(archive_entry_pathname(ae), "./f1") == 0) {
+			assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl1_text);
+			    
+		} else if (strcmp(archive_entry_pathname(ae), "./d/f1") == 0) {
+			assertEqualString(archive_entry_acl_text(ae, ARCHIVE_ENTRY_ACL_TYPE_ACCESS), acl2_text);
+		}
+	}
+
+	archive_free(a);
+#endif
+}

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_fifo.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -78,7 +78,11 @@ ATF_TC_BODY(fifo, tc)
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 
 	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+	    "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
 	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
 	    event[0].fflags, event[0].data);
 
 	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_file.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_file.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_file.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -111,7 +111,11 @@ ATF_TC_BODY(file, tc)
 		num += n;
 
 		(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+		    "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags,
+#else
 		    "%" PRId64 "\n", n, event[0].flags, event[0].fflags,
+#endif
 		    event[0].data);
 
 		if (event[0].data < 0)

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_pipe.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -67,7 +67,11 @@ ATF_TC_BODY(pipe, tc)
 
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 	(void)printf("kevent num %d flags: %#x, fflags: %#x, data: "
+#ifdef __FreeBSD__
+	    "%" PRIdPTR "\n", n, event[0].flags, event[0].fflags, event[0].data);
+#else
 	    "%" PRId64 "\n", n, event[0].flags, event[0].fflags, event[0].data);
+#endif
 
 	RL(n = read(fds[0], buffer, event[0].data));
 	buffer[n] = '\0';

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/read/t_ttypty.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -103,7 +103,11 @@ h_check(bool check_master)
 	RL(n = kevent(kq, NULL, 0, event, 1, NULL));
 
 	(void)printf("kevent num %d filt %d flags: %#x, fflags: %#x, "
+#ifdef __FreeBSD__
+	    "data: %" PRIdPTR "\n", n, event[0].filter, event[0].flags,
+#else
 	    "data: %" PRId64 "\n", n, event[0].filter, event[0].flags,
+#endif
 	    event[0].fflags, event[0].data);
 
 	ATF_REQUIRE_EQ(event[0].filter, EVFILT_READ);

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc1.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc1.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc1.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -139,7 +139,11 @@ ATF_TC_BODY(proc1, tc)
 			printf(" NOTE_FORK");
 		}
 		if (event[0].fflags & NOTE_CHILD)
+#ifdef __FreeBSD__
+			printf(" NOTE_CHILD, parent = %" PRIdPTR, event[0].data);
+#else
 			printf(" NOTE_CHILD, parent = %" PRId64, event[0].data);
+#endif
 
 		printf("\n");
 	}

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc2.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc2.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc2.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
 __RCSID("$NetBSD: t_proc2.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/types.h>

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc3.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc3.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_proc3.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -32,6 +32,9 @@
 #include <sys/cdefs.h>
 __RCSID("$NetBSD: t_proc3.c,v 1.2 2015/01/14 22:22:32 christos Exp $");
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
 #include <sys/event.h>
 #include <sys/time.h>
 #include <sys/types.h>

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_sig.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_sig.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_sig.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -34,6 +34,9 @@ __COPYRIGHT("@(#) Copyright (c) 2008\
  The NetBSD Foundation, inc. All rights reserved.");
 __RCSID("$NetBSD: t_sig.c,v 1.2 2010/11/03 16:10:20 christos Exp $");
 
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
 #include <sys/event.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
@@ -60,9 +63,13 @@ ATF_TC_HEAD(sig, tc)
 ATF_TC_BODY(sig, tc)
 {
 	struct timespec	timeout;
+#ifdef __NetBSD__
 	struct kfilter_mapping km;
+#endif
 	struct kevent event[1];
+#ifdef __NetBSD__
 	char namebuf[32];
+#endif
 	pid_t pid, child;
 	int kq, n, num, status;
 
@@ -84,16 +91,22 @@ ATF_TC_BODY(sig, tc)
 
 	RL(kq = kqueue());
 
+#ifdef __NetBSD__
 	(void)strlcpy(namebuf, "EVFILT_SIGNAL", sizeof(namebuf));
 	km.name = namebuf;
 	RL(ioctl(kq, KFILTER_BYNAME, &km));
 	(void)printf("got %d as filter number for `%s'.\n", km.filter, km.name);
+#endif
 
 	/* ignore the signal to avoid taking it for real */
 	REQUIRE_LIBC(signal(SIGUSR1, SIG_IGN), SIG_ERR);
 
 	event[0].ident = SIGUSR1;
+#ifdef __NetBSD__
 	event[0].filter = km.filter;
+#else
+	event[0].filter = EVFILT_SIGNAL;
+#endif
 	event[0].flags = EV_ADD | EV_ENABLE;
 
 	RL(kevent(kq, event, 1, NULL, 0, NULL));
@@ -117,7 +130,11 @@ ATF_TC_BODY(sig, tc)
 		if (n == 0)
 			continue;
 
+#ifdef __FreeBSD__
+		(void)printf("sig: kevent flags: 0x%x, data: %" PRIdPTR " (# "
+#else
 		(void)printf("sig: kevent flags: 0x%x, data: %" PRId64 " (# "
+#endif
 		    "times signal posted)\n", event[0].flags, event[0].data);
 	}
 

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_vnode.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_vnode.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/kernel/kqueue/t_vnode.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -1,3 +1,6 @@
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#endif
 #include <sys/event.h>
 #include <sys/stat.h>
 #include <sys/time.h>

Modified: user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/netbsd-tests/lib/libc/rpc/t_rpc.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -24,6 +24,13 @@ __RCSID("$NetBSD: t_rpc.c,v 1.9 2015/11/
 	return;						\
 } while(/*CONSTCOND*/0)
 
+#ifdef __FreeBSD__
+#define SKIPXI(ev, msg, ...)	do {			\
+	atf_tc_skip(msg, __VA_ARGS__);			\
+	return ev;					\
+} while(/*CONSTCOND*/0)
+#endif
+
 #else
 #define ERRX(ev, msg, ...)	errx(ev, msg, __VA_ARGS__)
 #define SKIPX(ev, msg, ...)	errx(ev, msg, __VA_ARGS__)
@@ -188,7 +195,13 @@ regtest(const char *hostname, const char
 	svc_fdset_init(p ? SVC_FDSET_POLL : 0);
 #endif
 	if (!svc_create(server, PROGNUM, VERSNUM, transp))
+#ifdef __NetBSD__
 		ERRX(EXIT_FAILURE, "Cannot create server %d", num);
+#else
+	{
+		SKIPXI(EXIT_FAILURE, "Cannot create server %d", num);
+	}
+#endif
 
 	switch ((pid = fork())) {
 	case 0:
@@ -335,6 +348,9 @@ ATF_TC(tcp);
 ATF_TC_HEAD(tcp, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks svc tcp (select)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(tcp, tc)
@@ -347,6 +363,9 @@ ATF_TC(udp);
 ATF_TC_HEAD(udp, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks svc udp (select)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(udp, tc)
@@ -359,6 +378,9 @@ ATF_TC(tcp_poll);
 ATF_TC_HEAD(tcp_poll, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks svc tcp (poll)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(tcp_poll, tc)
@@ -371,6 +393,9 @@ ATF_TC(udp_poll);
 ATF_TC_HEAD(udp_poll, tc)
 {
 	atf_tc_set_md_var(tc, "descr", "Checks svc udp (poll)");
+#ifdef __FreeBSD__
+	atf_tc_set_md_var(tc, "require.user", "root");
+#endif
 }
 
 ATF_TC_BODY(udp_poll, tc)

Modified: user/alc/PQ_LAUNDRY/contrib/top/commands.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/top/commands.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/top/commands.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -104,6 +104,7 @@ S       - toggle the displaying of syste
 a       - toggle the displaying of process titles\n\
 t       - toggle the display of this process\n\
 u       - display processes for only one user (+ selects all users)\n\
+w       - toggle the display of swap use for each process\n\
 z       - toggle the displaying of the system idle process\n\
 \n\
 \n", stdout);

Modified: user/alc/PQ_LAUNDRY/contrib/top/machine.h
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/top/machine.h	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/top/machine.h	Wed Sep  7 00:34:45 2016	(r305510)
@@ -72,6 +72,7 @@ struct process_select
     int wcpu;		/* show weighted cpu */
     int jid;		/* only this jid (unless jid == -1) */
     int jail;		/* show jail ID */
+    int swap;		/* show swap usage */
     int kidle;		/* show per-CPU idle threads */
     char *command;	/* only this command (unless == NULL) */
 };
@@ -82,8 +83,8 @@ char	*format_header();
 char	*format_next_process();
 void	 toggle_pcpustats(void);
 void	 get_system_info(struct system_info *si);
-int		 machine_init(struct statics *statics, char do_unames);
-int		 proc_owner(int pid);
+int	 machine_init(struct statics *statics, char do_unames);
+int	 proc_owner(int pid);
 
 /* non-int routines typically used by the machine dependent module */
 char	*printable();

Modified: user/alc/PQ_LAUNDRY/contrib/top/top.c
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/top/top.c	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/top/top.c	Wed Sep  7 00:34:45 2016	(r305510)
@@ -188,9 +188,9 @@ char *argv[];
     fd_set readfds;
 
 #ifdef ORDER
-    static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJo";
+    static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJwo";
 #else
-    static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJ";
+    static char command_chars[] = "\f qh?en#sdkriIutHmSCajzPJw";
 #endif
 /* these defines enumerate the "strchr"s of the commands in command_chars */
 #define CMD_redraw	0
@@ -219,8 +219,9 @@ char *argv[];
 #define CMD_kidletog	22
 #define CMD_pcputog	23
 #define CMD_jail	24
+#define CMD_swaptog	25
 #ifdef ORDER
-#define CMD_order       25
+#define CMD_order       26
 #endif
 
     /* set the buffer for stdout */
@@ -254,6 +255,7 @@ char *argv[];
     ps.wcpu    = 1;
     ps.jid     = -1;
     ps.jail    = No;
+    ps.swap    = No;
     ps.kidle   = Yes;
     ps.command = NULL;
 
@@ -280,7 +282,7 @@ char *argv[];
 	    optind = 1;
 	}
 
-	while ((i = getopt(ac, av, "CSIHPabijJ:nquvzs:d:U:m:o:t")) != EOF)
+	while ((i = getopt(ac, av, "CSIHPabijJ:nquvzs:d:U:m:o:tw")) != EOF)
 	{
 	    switch(i)
 	    {
@@ -418,6 +420,10 @@ char *argv[];
 		pcpu_stats = !pcpu_stats;
 		break;
 
+	      case 'w':
+		ps.swap = 1;
+		break;
+
 	      case 'z':
 		ps.kidle = !ps.kidle;
 		break;
@@ -1141,6 +1147,15 @@ restart:
 				reset_display();
 				putchar('\r');
 				break;
+			    case CMD_swaptog:
+				ps.swap = !ps.swap;
+				new_message(MT_standout | MT_delayed,
+				    " %sisplaying per-process swap usage.",
+				    ps.swap ? "D" : "Not d");
+				header_text = format_header(uname_field);
+				reset_display();
+				putchar('\r');
+				break;
 			    default:
 				new_message(MT_standout, " BAD CASE IN SWITCH!");
 				putchar('\r');

Modified: user/alc/PQ_LAUNDRY/contrib/top/top.xs
==============================================================================
--- user/alc/PQ_LAUNDRY/contrib/top/top.xs	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/contrib/top/top.xs	Wed Sep  7 00:34:45 2016	(r305510)
@@ -10,7 +10,7 @@ top \- display and update information ab
 .SH SYNOPSIS
 .B top
 [
-.B \-abCHIijnPqStuvz
+.B \-abCHIijnPqStuvwz
 ] [
 .BI \-d count
 ] [
@@ -148,6 +148,9 @@ Write version number information to stde
 No other processing takes place when this option is used.  To see current
 revision information while top is running, use the help command \*(lq?\*(rq.
 .TP
+.B \-w
+Display approximate swap usage for each process.
+.TP
 .B \-z
 Do not display the system idle process.
 .TP
@@ -167,11 +170,12 @@ Set the delay between screen updates to
 seconds.  The default delay between updates is \nD seconds.
 .TP
 .BI \-o field
-Sort the process display area on the specified field.  The field name is
-the name of the column as seen in the output, but in lower case.  Likely
-values are \*(lqcpu\*(rq, \*(lqsize\*(rq, \*(lqres\*(rq, and \*(lqtime\*(rq,
-but may vary on different operating systems.  Note that
-not all operating systems support this option.
+Sort the process display area on the specified field.  The field name
+is the name of the column as seen in the output, but in lower case:
+\*(lqcpu\*(lq, \*(rqsize\*(lq, \*(rqres\*(lq, \*(rqtime\*(lq,
+\*(rqpri\*(lq, \*(rqthreads\*(lq, \*(lqtotal\*(lq, \*(rqread\*(lq,
+\*(rqwrite\*(lq, \*(rqfault\*(lq, \*(rqvcsw\*(lq, \*(rqivcsw\*(lq,
+\*(lqjid\*(lq, \*(rqswap\*(lq or \*(rqpid\*(lq.
 .TP
 .BI \-J jail
 Show only those processes owned by
@@ -226,6 +230,7 @@ The options
 .BR \-S ,
 .BR \-t ,
 .BR \-u ,
+.BR \-w ,
 and
 .B \-z
 are actually toggles.  A second specification of any of these options
@@ -346,6 +351,9 @@ Toggle the display of the
 .I top
 process.
 .TP
+.B w
+Toggle the display of swap usage.
+.TP
 .B z
 Toggle the display of the system idle process.
 .SH "THE DISPLAY"
@@ -379,8 +387,9 @@ is specified, a UID column will be subst
 PRI is the current priority of the process,
 NICE is the nice amount (in the range \-20 to 20),
 SIZE is the total size of the process (text, data, and stack),
-RES is the current amount of resident memory (both SIZE and RES are
-given in kilobytes),
+RES is the current amount of resident memory,
+SWAP is the approximate amount of swap, if enabled
+(SIZE, RES and SWAP are given in kilobytes),
 STATE is the current state (one of \*(lqSTART\*(rq, \*(lqRUN\*(rq
 (shown as \*(lqCPUn\*(rq on SMP systems), \*(lqSLEEP\*(rq, \*(lqSTOP\*(rq,
 \*(lqZOMB\*(rq, \*(lqWAIT\*(rq, \*(lqLOCK\*(rq or the event on which the

Modified: user/alc/PQ_LAUNDRY/etc/mtree/BSD.tests.dist
==============================================================================
--- user/alc/PQ_LAUNDRY/etc/mtree/BSD.tests.dist	Tue Sep  6 23:42:59 2016	(r305509)
+++ user/alc/PQ_LAUNDRY/etc/mtree/BSD.tests.dist	Wed Sep  7 00:34:45 2016	(r305510)
@@ -419,6 +419,8 @@
             ..
         ..

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