svn commit: r327750 - in user/jeff/numa: . bin/cat contrib/subversion/subversion/svn etc/rc.d lib/libc/net lib/libcasper/libcasper lib/libcasper/services/cap_dns lib/libcasper/services/cap_dns/test...

Jeff Roberson jeff at FreeBSD.org
Tue Jan 9 22:00:12 UTC 2018 

Author: jeff
Date: Tue Jan  9 22:00:06 2018
New Revision: 327750
URL: https://svnweb.freebsd.org/changeset/base/327750

Log:
  Merge from HEAD

Added:
  user/jeff/numa/lib/libcasper/services/cap_dns/cap_dns.3
     - copied unchanged from r327749, head/lib/libcasper/services/cap_dns/cap_dns.3
  user/jeff/numa/sys/arm64/arm64/cpu_errata.c
     - copied unchanged from r327749, head/sys/arm64/arm64/cpu_errata.c
  user/jeff/numa/sys/contrib/dev/acpica/include/actbinfo.h
     - copied unchanged from r327749, head/sys/contrib/dev/acpica/include/actbinfo.h
  user/jeff/numa/sys/contrib/zstd/lib/freebsd/
     - copied from r327749, head/sys/contrib/zstd/lib/freebsd/
  user/jeff/numa/sys/kern/subr_compressor.c
     - copied unchanged from r327749, head/sys/kern/subr_compressor.c
  user/jeff/numa/sys/sys/compressor.h
     - copied unchanged from r327749, head/sys/sys/compressor.h
  user/jeff/numa/tests/sys/geom/class/eli/attach_test.sh
     - copied unchanged from r327749, head/tests/sys/geom/class/eli/attach_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/configure_test.sh
     - copied unchanged from r327749, head/tests/sys/geom/class/eli/configure_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/detach_test.sh
     - copied unchanged from r327749, head/tests/sys/geom/class/eli/detach_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/integrity_test.sh
     - copied unchanged from r327749, head/tests/sys/geom/class/eli/integrity_test.sh
Deleted:
  user/jeff/numa/sys/i386/isa/ccbque.h
  user/jeff/numa/sys/kern/kern_gzio.c
  user/jeff/numa/sys/sys/gzio.h
  user/jeff/numa/tests/sys/geom/class/eli/attach_d_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/configure_b_B_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/detach_l_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_B_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_J_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_a_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_alias_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_i_P_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/integrity_copy_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/integrity_data_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/integrity_hmac_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/nokey_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/onetime_a_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/onetime_d_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/readonly_test.sh
Modified:
  user/jeff/numa/ObsoleteFiles.inc
  user/jeff/numa/UPDATING
  user/jeff/numa/bin/cat/cat.c
  user/jeff/numa/contrib/subversion/subversion/svn/util.c
  user/jeff/numa/etc/rc.d/ntpd
  user/jeff/numa/lib/libc/net/rcmd.c
  user/jeff/numa/lib/libcasper/libcasper/libcasper.3
  user/jeff/numa/lib/libcasper/libcasper/libcasper.h
  user/jeff/numa/lib/libcasper/services/cap_dns/Makefile
  user/jeff/numa/lib/libcasper/services/cap_dns/tests/Makefile
  user/jeff/numa/lib/libcasper/services/cap_grp/tests/Makefile
  user/jeff/numa/lib/libcasper/services/cap_pwd/tests/Makefile
  user/jeff/numa/lib/libcasper/services/cap_sysctl/tests/Makefile
  user/jeff/numa/lib/libefivar/efivar-dp-xlate.c
  user/jeff/numa/sbin/ldconfig/ldconfig.8
  user/jeff/numa/sbin/newfs_msdos/mkfs_msdos.c
  user/jeff/numa/share/man/man4/aw_sid.4
  user/jeff/numa/share/man/man4/cxgbe.4
  user/jeff/numa/share/man/man4/smp.4
  user/jeff/numa/share/man/man5/core.5
  user/jeff/numa/share/man/man9/malloc.9
  user/jeff/numa/share/misc/bsd-family-tree
  user/jeff/numa/share/misc/organization.dot
  user/jeff/numa/stand/i386/libfirewire/firewire.c
  user/jeff/numa/stand/i386/libi386/biospci.c
  user/jeff/numa/stand/i386/libi386/comconsole.c
  user/jeff/numa/stand/i386/libi386/libi386.h
  user/jeff/numa/stand/mips/beri/boot2/Makefile
  user/jeff/numa/stand/mips/beri/boot2/boot2.c
  user/jeff/numa/stand/mips/beri/common/sdcard.c
  user/jeff/numa/stand/mips/beri/loader/Makefile
  user/jeff/numa/stand/mips/beri/loader/exec.c
  user/jeff/numa/stand/mips/beri/loader/main.c
  user/jeff/numa/sys/amd64/amd64/machdep.c
  user/jeff/numa/sys/amd64/vmm/amd/svm.c
  user/jeff/numa/sys/amd64/vmm/amd/svm_softc.h
  user/jeff/numa/sys/amd64/vmm/amd/vmcb.h
  user/jeff/numa/sys/arm/allwinner/aw_sid.c
  user/jeff/numa/sys/arm/allwinner/files.allwinner
  user/jeff/numa/sys/arm/allwinner/if_awg.c
  user/jeff/numa/sys/arm/conf/GENERIC
  user/jeff/numa/sys/arm64/arm64/machdep.c
  user/jeff/numa/sys/arm64/arm64/mp_machdep.c
  user/jeff/numa/sys/arm64/arm64/pmap.c
  user/jeff/numa/sys/arm64/arm64/swtch.S
  user/jeff/numa/sys/arm64/conf/GENERIC
  user/jeff/numa/sys/arm64/include/cpu.h
  user/jeff/numa/sys/arm64/include/pmap.h
  user/jeff/numa/sys/cam/ata/ata_da.c
  user/jeff/numa/sys/cam/cam_periph.c
  user/jeff/numa/sys/cam/cam_periph.h
  user/jeff/numa/sys/cam/cam_xpt.c
  user/jeff/numa/sys/cam/nvme/nvme_da.c
  user/jeff/numa/sys/cam/nvme/nvme_xpt.c
  user/jeff/numa/sys/cam/scsi/scsi_da.c
  user/jeff/numa/sys/cam/scsi/scsi_low.c
  user/jeff/numa/sys/cam/scsi/scsi_low.h
  user/jeff/numa/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/jeff/numa/sys/compat/cloudabi/cloudabi_futex.c
  user/jeff/numa/sys/compat/cloudabi/cloudabi_util.h
  user/jeff/numa/sys/compat/cloudabi32/cloudabi32_poll.c
  user/jeff/numa/sys/compat/cloudabi32/cloudabi32_sock.c
  user/jeff/numa/sys/compat/cloudabi64/cloudabi64_poll.c
  user/jeff/numa/sys/compat/cloudabi64/cloudabi64_sock.c
  user/jeff/numa/sys/compat/linuxkpi/common/include/linux/slab.h
  user/jeff/numa/sys/conf/files
  user/jeff/numa/sys/conf/files.arm64
  user/jeff/numa/sys/conf/kern.pre.mk
  user/jeff/numa/sys/contrib/dev/acpica/acpica_prep.sh
  user/jeff/numa/sys/contrib/dev/acpica/changes.txt
  user/jeff/numa/sys/contrib/dev/acpica/common/acfileio.c
  user/jeff/numa/sys/contrib/dev/acpica/common/acgetline.c
  user/jeff/numa/sys/contrib/dev/acpica/common/adfile.c
  user/jeff/numa/sys/contrib/dev/acpica/common/adisasm.c
  user/jeff/numa/sys/contrib/dev/acpica/common/adwalk.c
  user/jeff/numa/sys/contrib/dev/acpica/common/ahids.c
  user/jeff/numa/sys/contrib/dev/acpica/common/ahpredef.c
  user/jeff/numa/sys/contrib/dev/acpica/common/ahtable.c
  user/jeff/numa/sys/contrib/dev/acpica/common/ahuuids.c
  user/jeff/numa/sys/contrib/dev/acpica/common/cmfsize.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmextern.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmrestag.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmswitch.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmtable.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmtables.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmtbdump.c
  user/jeff/numa/sys/contrib/dev/acpica/common/dmtbinfo.c
  user/jeff/numa/sys/contrib/dev/acpica/common/getopt.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslallocate.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslanalyze.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslascii.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslbtypes.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcache.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcodegen.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcompile.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcompiler.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcompiler.l
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslcstyle.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asldebug.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asldefine.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslerror.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslexternal.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslfileio.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslfiles.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslfold.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslglobal.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslhelp.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslhelpers.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslhex.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslkeywords.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asllength.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asllisting.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asllistsup.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslload.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asllookup.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmain.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmap.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmapenter.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmapoutput.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmaputils.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmessages.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmessages.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslmethod.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslnamesp.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asloffset.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslopcodes.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asloperands.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslopt.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asloptions.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslparseop.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslparser.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslpld.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslpredef.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslprepkg.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslprimaries.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslprintf.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslprune.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslresource.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslresources.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype1.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslrules.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslstartup.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslstubs.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslsupport.l
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslsupport.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asltokens.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asltransform.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asltree.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asltypes.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asltypes.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslutils.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/asluuid.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslwalks.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslxref.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/aslxrefout.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/cvcompiler.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/cvdisasm.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/cvparser.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtcompile.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtcompiler.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtexpress.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtfield.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtio.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtparser.l
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtparser.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtsubtable.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dttable.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dttable1.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dttable2.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dttemplate.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dttemplate.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/dtutils.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/preprocess.h
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prexpress.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prmacros.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prparser.l
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prparser.y
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prscan.c
  user/jeff/numa/sys/contrib/dev/acpica/compiler/prutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbconvert.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbdisply.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbexec.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbhistry.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbinput.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbmethod.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbnames.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbobject.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbstats.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbtest.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/debugger/dbxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmcstyle.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmdeferred.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmnames.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmopcode.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmresrc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmresrcs.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/disassembler/dmwalk.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsargs.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dscontrol.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsdebug.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsfield.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsinit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsmethod.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsmthdat.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsobject.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsopcode.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dspkginit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dsutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dswexec.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dswload.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dswload2.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dswscope.c
  user/jeff/numa/sys/contrib/dev/acpica/components/dispatcher/dswstate.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evevent.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evglock.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evgpe.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evgpeblk.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evgpeinit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evgpeutil.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evhandler.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evmisc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evregion.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evrgnini.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evsci.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evxfevnt.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evxfgpe.c
  user/jeff/numa/sys/contrib/dev/acpica/components/events/evxfregn.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exconcat.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exconfig.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exconvrt.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/excreate.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exdebug.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exdump.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exfield.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exfldio.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exmisc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exmutex.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exnames.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exoparg1.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exoparg2.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exoparg3.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exoparg6.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exprep.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exregion.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exresnte.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exresolv.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exresop.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exstore.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exstoren.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exstorob.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exsystem.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/extrace.c
  user/jeff/numa/sys/contrib/dev/acpica/components/executer/exutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwacpi.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwesleep.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwgpe.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwpci.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwregs.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwsleep.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwvalid.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/hardware/hwxfsleep.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsalloc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsarguments.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsconvert.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsdump.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsdumpdv.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nseval.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsinit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsload.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsnames.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsobject.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsparse.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nspredef.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsprepkg.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsrepair.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsrepair2.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nssearch.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nswalk.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsxfname.c
  user/jeff/numa/sys/contrib/dev/acpica/components/namespace/nsxfobj.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psargs.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psloop.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psobject.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psopcode.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psopinfo.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psparse.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psscope.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/pstree.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/pswalk.c
  user/jeff/numa/sys/contrib/dev/acpica/components/parser/psxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsaddr.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rscalc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rscreate.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsdump.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsdumpinfo.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsinfo.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsio.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsirq.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rslist.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsmemory.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsmisc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsserial.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/resources/rsxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbdata.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbfadt.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbfind.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbinstal.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbprint.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbutils.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbxfload.c
  user/jeff/numa/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utaddress.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utalloc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utascii.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utbuffer.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utcache.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utcopy.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utdebug.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utdecode.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utdelete.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/uterror.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/uteval.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utexcep.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utglobal.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/uthex.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utids.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utinit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utlock.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utmath.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utmisc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utmutex.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utnonansi.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utobject.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utosi.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utownerid.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utpredef.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utresdecode.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utresrc.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utstate.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utstring.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utstrsuppt.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utstrtoul64.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/uttrack.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utuuid.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utxface.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utxferror.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utxfinit.c
  user/jeff/numa/sys/contrib/dev/acpica/components/utilities/utxfmutex.c
  user/jeff/numa/sys/contrib/dev/acpica/include/acapps.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acbuffer.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acclib.h
  user/jeff/numa/sys/contrib/dev/acpica/include/accommon.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acconfig.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acconvert.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acdebug.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acdisasm.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acdispat.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acevents.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acexcep.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acglobal.h
  user/jeff/numa/sys/contrib/dev/acpica/include/achware.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acinterp.h
  user/jeff/numa/sys/contrib/dev/acpica/include/aclocal.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acmacros.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acnames.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acnamesp.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acobject.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acopcode.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acoutput.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acparser.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acpi.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acpiosxf.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acpixf.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acpredef.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acresrc.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acrestyp.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acstruct.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actables.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actbl.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actbl1.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actbl2.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actbl3.h
  user/jeff/numa/sys/contrib/dev/acpica/include/actypes.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acutils.h
  user/jeff/numa/sys/contrib/dev/acpica/include/acuuid.h
  user/jeff/numa/sys/contrib/dev/acpica/include/amlcode.h
  user/jeff/numa/sys/contrib/dev/acpica/include/amlresrc.h
  user/jeff/numa/sys/contrib/dev/acpica/include/platform/acenv.h
  user/jeff/numa/sys/contrib/dev/acpica/include/platform/acenvex.h
  user/jeff/numa/sys/contrib/dev/acpica/include/platform/acfreebsd.h
  user/jeff/numa/sys/contrib/dev/acpica/include/platform/acgcc.h
  user/jeff/numa/sys/contrib/dev/acpica/include/platform/acgccex.h
  user/jeff/numa/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  user/jeff/numa/sys/contrib/ipfilter/netinet/ip_state.c
  user/jeff/numa/sys/contrib/vchiq/interface/compat/vchi_bsd.h
  user/jeff/numa/sys/ddb/db_textdump.c
  user/jeff/numa/sys/dev/acpica/acpi.c
  user/jeff/numa/sys/dev/ath/if_ath_ioctl.c
  user/jeff/numa/sys/dev/bhnd/cores/pmu/bhnd_pmu_subr.c
  user/jeff/numa/sys/dev/cpuctl/cpuctl.c
  user/jeff/numa/sys/dev/cxgbe/t4_main.c
  user/jeff/numa/sys/dev/extres/syscon/syscon_generic.c
  user/jeff/numa/sys/dev/psci/psci.c
  user/jeff/numa/sys/dev/psci/psci.h
  user/jeff/numa/sys/dev/usb/usbdevs
  user/jeff/numa/sys/fs/ext2fs/ext2_alloc.c
  user/jeff/numa/sys/fs/ext2fs/ext2_balloc.c
  user/jeff/numa/sys/fs/ext2fs/ext2_csum.c
  user/jeff/numa/sys/fs/ext2fs/ext2_extents.c
  user/jeff/numa/sys/fs/ext2fs/ext2_extents.h
  user/jeff/numa/sys/fs/ext2fs/ext2_extern.h
  user/jeff/numa/sys/fs/ext2fs/ext2_hash.c
  user/jeff/numa/sys/fs/ext2fs/ext2_subr.c
  user/jeff/numa/sys/fs/ext2fs/ext2_vfsops.c
  user/jeff/numa/sys/fs/ext2fs/ext2_vnops.c
  user/jeff/numa/sys/fs/ext2fs/ext2fs.h
  user/jeff/numa/sys/fs/ext2fs/fs.h
  user/jeff/numa/sys/fs/procfs/procfs.c
  user/jeff/numa/sys/geom/mirror/g_mirror.c
  user/jeff/numa/sys/geom/mirror/g_mirror_ctl.c
  user/jeff/numa/sys/kern/imgact_elf.c
  user/jeff/numa/sys/kern/kern_malloc.c
  user/jeff/numa/sys/kern/kern_proc.c
  user/jeff/numa/sys/kern/kern_resource.c
  user/jeff/numa/sys/kern/kern_sendfile.c
  user/jeff/numa/sys/kern/kern_shutdown.c
  user/jeff/numa/sys/kern/kern_sig.c
  user/jeff/numa/sys/kern/subr_bus.c
  user/jeff/numa/sys/kern/vfs_mount.c
  user/jeff/numa/sys/modules/gpio/gpiobus/Makefile
  user/jeff/numa/sys/net/if_lagg.c
  user/jeff/numa/sys/netpfil/pf/pf_ioctl.c
  user/jeff/numa/sys/opencrypto/crypto.c
  user/jeff/numa/sys/powerpc/conf/GENERIC64
  user/jeff/numa/sys/powerpc/include/vmparam.h
  user/jeff/numa/sys/powerpc/powerpc/elf32_machdep.c
  user/jeff/numa/sys/powerpc/pseries/platform_chrp.c
  user/jeff/numa/sys/sys/_stdarg.h
  user/jeff/numa/sys/sys/conf.h
  user/jeff/numa/sys/sys/cpuctl.h
  user/jeff/numa/sys/sys/imgact.h
  user/jeff/numa/sys/sys/malloc.h
  user/jeff/numa/sys/sys/syslimits.h
  user/jeff/numa/sys/tools/embed_mfs.sh
  user/jeff/numa/sys/ufs/ffs/ffs_softdep.c
  user/jeff/numa/sys/ufs/ffs/ffs_vfsops.c
  user/jeff/numa/sys/ufs/ufs/ufs_lookup.c
  user/jeff/numa/sys/ufs/ufs/ufs_vnops.c
  user/jeff/numa/sys/vm/vm_swapout.c
  user/jeff/numa/sys/x86/include/x86_var.h
  user/jeff/numa/sys/x86/x86/identcpu.c
  user/jeff/numa/sys/x86/x86/local_apic.c
  user/jeff/numa/tests/sys/geom/class/eli/Makefile
  user/jeff/numa/tests/sys/geom/class/eli/conf.sh
  user/jeff/numa/tests/sys/geom/class/eli/delkey_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/init_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/kill_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/onetime_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/resize_test.sh
  user/jeff/numa/tests/sys/geom/class/eli/setkey_test.sh
  user/jeff/numa/tests/sys/netpfil/pf/pft_ping.py
  user/jeff/numa/usr.bin/find/tests/find_test.sh
  user/jeff/numa/usr.bin/hexdump/display.c
  user/jeff/numa/usr.bin/kdump/kdump.c
  user/jeff/numa/usr.bin/morse/morse.6
  user/jeff/numa/usr.bin/morse/morse.c
  user/jeff/numa/usr.bin/units/units.c
  user/jeff/numa/usr.sbin/cpucontrol/cpucontrol.8
  user/jeff/numa/usr.sbin/cpucontrol/cpucontrol.c
  user/jeff/numa/usr.sbin/devmatch/devmatch.8
  user/jeff/numa/usr.sbin/diskinfo/diskinfo.c
  user/jeff/numa/usr.sbin/dumpcis/printcis.c
  user/jeff/numa/usr.sbin/dumpcis/readcis.c
  user/jeff/numa/usr.sbin/dumpcis/readcis.h
  user/jeff/numa/usr.sbin/efibootmgr/efibootmgr.c
  user/jeff/numa/usr.sbin/efidp/efidp.c
  user/jeff/numa/usr.sbin/fdcontrol/fdcontrol.c
  user/jeff/numa/usr.sbin/fwcontrol/fwdv.c
  user/jeff/numa/usr.sbin/ifmcstat/printb.c
  user/jeff/numa/usr.sbin/pciconf/cap.c
  user/jeff/numa/usr.sbin/pciconf/pciconf.c
  user/jeff/numa/usr.sbin/usbconfig/usbconfig.8
Directory Properties:
  user/jeff/numa/   (props changed)
  user/jeff/numa/contrib/subversion/   (props changed)
  user/jeff/numa/sys/cddl/contrib/opensolaris/   (props changed)
  user/jeff/numa/sys/contrib/dev/acpica/   (props changed)
  user/jeff/numa/sys/contrib/ipfilter/   (props changed)
  user/jeff/numa/sys/contrib/zstd/   (props changed)

Modified: user/jeff/numa/ObsoleteFiles.inc
==============================================================================
--- user/jeff/numa/ObsoleteFiles.inc	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/ObsoleteFiles.inc	Tue Jan  9 22:00:06 2018	(r327750)
@@ -38,6 +38,23 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20180107: Convert remaining geli(8) tests to ATF
+OLD_FILES+=tests/sys/geom/class/eli/nokey_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/readonly_test.sh
+# 20180106: Convert most geli(8) tests to ATF
+OLD_FILES+=tests/sys/geom/class/eli/attach_d_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/configure_b_B_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/detach_l_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_B_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_J_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_a_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_alias_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/init_i_P_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_copy_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_data_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/integrity_hmac_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/onetime_a_test.sh
+OLD_FILES+=tests/sys/geom/class/eli/onetime_d_test.sh
 # 20171230: Remove /etc/skel from mtree
 OLD_DIRS+=/etc/skel
 # 20171208: Remove basename_r(3)

Modified: user/jeff/numa/UPDATING
==============================================================================
--- user/jeff/numa/UPDATING	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/UPDATING	Tue Jan  9 22:00:06 2018	(r327750)
@@ -51,6 +51,20 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20180104:
+	The use of RSS hash from the network card aka flowid has been
+	disabled by default for lagg(4) as it's currently incompatible with
+	the lacp and loadbalance protocols.
+
+	This can be re-enabled by setting the following in loader.conf:
+	net.link.lagg.default_use_flowid="1"
+
+20180102:
+	The SW_WATCHDOG option is no longer necessary to enable the
+	hardclock-based software watchdog if no hardware watchdog is
+	configured. As before, SW_WATCHDOG will cause the software
+	watchdog to be enabled even if a hardware watchdog is configured.
+
 20171215:
 	r326887 fixes the issue described in the 20171214 UPDATING entry.
 	r326888 flips the switch back to building GELI support always.

Modified: user/jeff/numa/bin/cat/cat.c
==============================================================================
--- user/jeff/numa/bin/cat/cat.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/bin/cat/cat.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <errno.h>
 #include <fcntl.h>
 #include <locale.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -300,6 +299,7 @@ ilseq:
 static void
 raw_cat(int rfd)
 {
+	long pagesize;
 	int off, wfd;
 	ssize_t nr, nw;
 	static size_t bsize;
@@ -316,9 +316,12 @@ raw_cat(int rfd)
 				bsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
 			else
 				bsize = BUFSIZE_SMALL;
-		} else
-			bsize = MAX(sbuf.st_blksize,
-			    (blksize_t)sysconf(_SC_PAGESIZE));
+		} else {
+			bsize = sbuf.st_blksize;
+			pagesize = sysconf(_SC_PAGESIZE);
+			if (pagesize > 0)
+				bsize = MAX(bsize, (size_t)pagesize);
+		}
 		if ((buf = malloc(bsize)) == NULL)
 			err(1, "malloc() failure of IO buffer");
 	}

Modified: user/jeff/numa/contrib/subversion/subversion/svn/util.c
==============================================================================
--- user/jeff/numa/contrib/subversion/subversion/svn/util.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/contrib/subversion/subversion/svn/util.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -352,6 +352,7 @@ static const char *prefixes[] = {
   "Relnotes:",
   "Security:",
   "Sponsored by:",
+  "Pull Request:",
   "Differential Revision:",
 };
 
@@ -443,6 +444,7 @@ svn_cl__get_log_message(const char **log_msg,
   if (sponsored_by != NULL)
 	  svn_stringbuf_appendcstr(default_msg, sponsored_by);
   svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "Pull Request:\t" APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
   svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
@@ -458,6 +460,7 @@ svn_cl__get_log_message(const char **log_msg,
   svn_stringbuf_appendcstr(default_msg, "> Relnotes:                 Set to 'yes' for mention in release notes." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Security:                 Vulnerability reference (one per line) or description." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Sponsored by:             If the change was sponsored by an organization." APR_EOL_STR);
+  svn_stringbuf_appendcstr(default_msg, "> Pull Request:             https://github.com/freebsd/freebsd/pull/### (*full* GitHub URL needed)." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Differential Revision:    https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR);
   svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);

Modified: user/jeff/numa/etc/rc.d/ntpd
==============================================================================
--- user/jeff/numa/etc/rc.d/ntpd	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/etc/rc.d/ntpd	Tue Jan  9 22:00:06 2018	(r327750)
@@ -144,9 +144,9 @@ ntpd_fetch_leapfile() {
 		done
 		ntp_ver_no_tmp=$(get_ntp_leapfile_ver $ntp_tmp_leapfile)
 		ntp_expiry_tmp=$(get_ntp_leapfile_expiry $ntp_tmp_leapfile)
-		if [ "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" -o \
-		     "$ntp_ver_no_tmp" -eq "$ntp_ver_no_db" -a \
-		     "$ntp_expiry_tmp" -gt "$ntp_expiry_db" ]; then
+		if [ "$ntp_expiry_tmp" -gt "$ntp_expiry_db" -o \
+		     "$ntp_expiry_tmp" -eq "$ntp_expiry_db" -a \
+		     "$ntp_ver_no_tmp" -gt "$ntp_ver_no_db" ]; then
 			$verbose using $url as $ntp_db_leapfile
 			mv $ntp_tmp_leapfile $ntp_db_leapfile
 		else

Modified: user/jeff/numa/lib/libc/net/rcmd.c
==============================================================================
--- user/jeff/numa/lib/libc/net/rcmd.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libc/net/rcmd.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -457,8 +457,8 @@ again:
 		first = 0;
 		if ((pwd = getpwnam(luser)) == NULL)
 			return (-1);
-		(void)strcpy(pbuf, pwd->pw_dir);
-		(void)strcat(pbuf, "/.rhosts");
+		(void)strlcpy(pbuf, pwd->pw_dir, sizeof(pbuf));
+		(void)strlcat(pbuf, "/.rhosts", sizeof(pbuf));
 
 		/*
 		 * Change effective uid while opening .rhosts.  If root and

Modified: user/jeff/numa/lib/libcasper/libcasper/libcasper.3
==============================================================================
--- user/jeff/numa/lib/libcasper/libcasper/libcasper.3	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/libcasper/libcasper.3	Tue Jan  9 22:00:06 2018	(r327750)
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 29, 2017
+.Dd January 3, 2018
 .Dt LIBCASPER 3
 .Os
 .Sh NAME
@@ -190,6 +190,30 @@ obtained via the
 .Fn cap_init
 function.
 The function returns capability that provides access to opened service.
+Casper supports the following services in the base system:
+.Bl -tag -width "system.random" -compact -offset indent
+.Pp
+.It system.dns
+provides DNS libc compatible API
+.It system.grp
+provides
+.Xr getgrent 3
+compatible API
+.It system.pwd
+provides
+.Xr getpwent 3
+compatible API
+.It system.random
+allows to obtain entropy from
+.Pa /dev/random
+.It system.sysctl
+provides
+.Xr sysctlbyname 3
+compatible API
+.It system.syslog
+provides
+.Xr syslog 3
+compatible API
 .Sh RETURN VALUES
 The
 .Fn cap_clone ,

Modified: user/jeff/numa/lib/libcasper/libcasper/libcasper.h
==============================================================================
--- user/jeff/numa/lib/libcasper/libcasper/libcasper.h	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/libcasper/libcasper.h	Tue Jan  9 22:00:06 2018	(r327750)
@@ -122,7 +122,15 @@ cap_wrap(int sock)
 #ifdef WITH_CASPER
 int	cap_unwrap(cap_channel_t *chan);
 #else
-#define	cap_unwrap(chan)	(chan->cch_fd)
+static inline int
+cap_unwrap(cap_channel_t *chan)
+{
+	int fd;
+
+	fd = chan->cch_fd;
+	free(chan);
+	return (fd);
+}
 #endif
 
 /*

Modified: user/jeff/numa/lib/libcasper/services/cap_dns/Makefile
==============================================================================
--- user/jeff/numa/lib/libcasper/services/cap_dns/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/services/cap_dns/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -24,4 +24,14 @@ CFLAGS+=-I${.CURDIR}
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
+MAN+=	cap_dns.3
+
+MLINKS+=cap_dns.3 libcap_dns.3
+MLINKS+=cap_dns.3 cap_gethostbyname.3
+MLINKS+=cap_dns.3 cap_gethostbyname2.3
+MLINKS+=cap_dns.3 cap_gethostbyaddr.3
+MLINKS+=cap_dns.3 cap_getnameinfo.3
+MLINKS+=cap_dns.3 cap_dns_type_limit.3
+MLINKS+=cap_dns.3 cap_dns_family_limit.3
+
 .include <bsd.lib.mk>

Copied: user/jeff/numa/lib/libcasper/services/cap_dns/cap_dns.3 (from r327749, head/lib/libcasper/services/cap_dns/cap_dns.3)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/jeff/numa/lib/libcasper/services/cap_dns/cap_dns.3	Tue Jan  9 22:00:06 2018	(r327750, copy of r327749, head/lib/libcasper/services/cap_dns/cap_dns.3)
@@ -0,0 +1,205 @@
+.\" Copyright (c) 2018 Mariusz Zaborski <oshogbo at FreeBSD.org>
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd January 8, 2018
+.Dt CAP_DNS 3
+.Os
+.Sh NAME
+.Nm cap_gethostbyname ,
+.Nm cap_gethostbyname2 ,
+.Nm cap_gethostbyaddr ,
+.Nm cap_getnameinfo ,
+.Nm cap_dns_type_limit ,
+.Nm cap_dns_family_limit
+.Nd "library for getting network host entry in capability mode"
+.Sh LIBRARY
+.Lb libcap_dns
+.Sh SYNOPSIS
+.In sys/nv.h
+.In libcasper.h
+.In casper/cap_dns.h
+.Ft "struct hostent *"
+.Fn cap_gethostbyname "const cap_channel_t *chan" "const char *name"
+.Ft "struct hostent *"
+.Fn cap_gethostbyname2 "const cap_channel_t *chan" "const char *name" "int af"
+.Ft "struct hostent *"
+.Fn cap_gethostbyaddr "const cap_channel_t *chan" "const void *addr" "socklen_t len" "int af"
+.Ft "int"
+.Fn cap_getnameinfo "const cap_channel_t *chan" "const void *name" "int namelen"
+.Ft "int"
+.Fn cap_dns_type_limit "cap_channel_t *chan" "const char * const *types" "size_t ntypes"
+.Ft "int"
+.Fn cap_dns_family_limit "const cap_channel_t *chan" "const int *families" "size_t nfamilies"
+.Sh DESCRIPTION
+The functions
+.Fn cap_gethostbyname ,
+.Fn cap_gethostbyname2 ,
+.Fn cep_gethostbyaddr
+and
+.Xr cap_getnameinfo
+are respectively equivalent to
+.Xr gethostbyname 2 ,
+.Xr gethostbyname2 2 ,
+.Xr gethostbyaddr 2
+and
+.Xr getnameinfo 2
+except that the connection to the
+.Nm system.dns
+service needs to be provided.
+.Pp
+The
+.Fn cap_dns_type_limit
+function limits the functions allowed in the service.
+The
+.Fa types
+variable can be set to
+.Dv ADDR
+or
+.Dv NAME .
+See the
+.Sx LIMITS
+section for more details.
+The
+.Fa ntpyes
+variable contains the number of
+.Fa types
+provided.
+.Pp
+The
+.Fn cap_dns_family_limit
+functions allows to limit address families.
+For details see
+.Sx LIMITS .
+The
+.Fa nfamilies
+variable contains the number of
+.Fa families
+provided.
+.Sh LIMITS
+The preferred way of setting limits is to use the
+.Fn cap_dns_type_limit
+and
+.Fn cap_dns_family_limit
+functions, but the limits of service can be set also using
+.Xr cap_limit_set 3 .
+The nvlist for that function can contain the following values and types:
+.Bl -ohang -offset indent
+.It type ( NV_TYPE_STRING )
+The
+.Va type
+can have two values:
+.Dv ADDR
+or
+.Dv NAME .
+The
+.Dv ADDR
+means that functions
+.Fn cap_gethostbyname ,
+.Fn cap_gethostbyname2
+and
+.Fn cap_gethostbyaddr
+are allowed.
+In case when
+.Va type
+is set to
+.Dv NAME
+the
+.Fn cap_getnameinfo
+function is allowed.
+.It family ( NV_TYPE_NUMBER )
+The
+.Va family
+limits service to one of the address families (e.g.
+.Dv AF_INET , AF_INET6 ,
+etc.).
+.Sh EXAMPLES
+The following example first opens a capability to casper and then uses this
+capability to create the
+.Nm system.dns
+casper service and uses it to resolve an IP address.
+.Bd -literal
+cap_channel_t *capcas, *capdns;
+const char *typelimit = "ADDR";
+int familylimit;
+const char *ipstr = "127.0.0.1";
+struct in_addr ip;
+struct hostent *hp;
+
+/* Open capability to Casper. */
+capcas = cap_init();
+if (capcas == NULL)
+	err(1, "Unable to contact Casper");
+
+/* Enter capability mode sandbox. */
+if (cap_enter() < 0 && errno != ENOSYS)
+	err(1, "Unable to enter capability mode");
+
+/* Use Casper capability to create capability to the system.dns service. */
+capdns = cap_service_open(capcas, "system.dns");
+if (capdns == NULL)
+	err(1, "Unable to open system.dns service");
+
+/* Close Casper capability, we don't need it anymore. */
+cap_close(capcas);
+
+/* Limit system.dns to reverse DNS lookups. */
+if (cap_dns_type_limit(capdns, &typelimit, 1) < 0)
+	err(1, "Unable to limit access to the system.dns service");
+
+/* Limit system.dns to reserve IPv4 addresses */
+familylimit = AF_INET;
+if (cap_dns_family_limit(capdns, &familylimit, 1) < 0)
+	err(1, "Unable to limit access to the system.dns service");
+
+/* Convert IP address in C-string to in_addr. */
+if (!inet_aton(ipstr, &ip))
+	errx(1, "Unable to parse IP address %s.", ipstr);
+
+/* Find hostname for the given IP address. */
+hp = cap_gethostbyaddr(capdns, (const void *)&ip, sizeof(ip), AF_INET);
+if (hp == NULL)
+	errx(1, "No name associated with %s.", ipstr);
+
+printf("Name associated with %s is %s.\\n", ipstr, hp->h_name);
+.Ed
+.Sh SEE ALSO
+.Xr cap_enter 2 ,
+.Xr err 3 ,
+.Xr gethostbyaddr 3 ,
+.Xr gethostbyname 3 ,
+.Xr gethostbyname2 3 ,
+.Xr getnameinfo 3,
+.Xr nv 3 ,
+.Xr capsicum 4
+.Sh AUTHORS
+The
+.Nm cap_dns
+service was implemented by
+.An Pawel Jakub Dawidek Aq Mt pawel at dawidek.net
+under sponsorship from the FreeBSD Foundation.
+.Pp
+This manual page was written by
+.An Mariusz Zaborski Aq Mt oshogbo at FreeBSD.org .

Modified: user/jeff/numa/lib/libcasper/services/cap_dns/tests/Makefile
==============================================================================
--- user/jeff/numa/lib/libcasper/services/cap_dns/tests/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/services/cap_dns/tests/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -7,6 +7,7 @@ TAP_TESTS_C=	dns_test
 .if ${MK_CASPER} != "no"
 LIBADD+=	casper
 LIBADD+=	cap_dns
+CFLAGS+=-DWITH_CASPER
 .endif
 LIBADD+=	nv
 

Modified: user/jeff/numa/lib/libcasper/services/cap_grp/tests/Makefile
==============================================================================
--- user/jeff/numa/lib/libcasper/services/cap_grp/tests/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/services/cap_grp/tests/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -7,6 +7,7 @@ TAP_TESTS_C=	grp_test
 .if ${MK_CASPER} != "no"
 LIBADD+=	casper
 LIBADD+=	cap_grp
+CFLAGS+=-DWITH_CASPER
 .endif
 LIBADD+=	nv
 

Modified: user/jeff/numa/lib/libcasper/services/cap_pwd/tests/Makefile
==============================================================================
--- user/jeff/numa/lib/libcasper/services/cap_pwd/tests/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/services/cap_pwd/tests/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -7,6 +7,7 @@ TAP_TESTS_C=	pwd_test
 .if ${MK_CASPER} != "no"
 LIBADD+=	casper
 LIBADD+=	cap_pwd
+CFLAGS+=-DWITH_CASPER
 .endif
 LIBADD+=	nv
 

Modified: user/jeff/numa/lib/libcasper/services/cap_sysctl/tests/Makefile
==============================================================================
--- user/jeff/numa/lib/libcasper/services/cap_sysctl/tests/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libcasper/services/cap_sysctl/tests/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -7,6 +7,7 @@ TAP_TESTS_C=	sysctl_test
 .if ${MK_CASPER} != "no"
 LIBADD+=	casper
 LIBADD+=	cap_sysctl
+CFLAGS+=-DWITH_CASPER
 .endif
 LIBADD+=	nv
 

Modified: user/jeff/numa/lib/libefivar/efivar-dp-xlate.c
==============================================================================
--- user/jeff/numa/lib/libefivar/efivar-dp-xlate.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/lib/libefivar/efivar-dp-xlate.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -527,12 +527,17 @@ find_geom_efimedia(struct gmesh *mesh, const char *dev
 static int
 build_dp(const char *efimedia, const char *relpath, efidp *dp)
 {
-	char *fp, *dptxt = NULL;
+	char *fp, *dptxt = NULL, *cp, *rp;
 	int rv = 0;
 	efidp out = NULL;
 	size_t len;
 
-	fp = path_to_file_dp(relpath);
+	rp = strdup(relpath);
+	for (cp = rp; *cp; cp++)
+		if (*cp == '/')
+			*cp = '\\';
+	fp = path_to_file_dp(rp);
+	free(rp);
 	if (fp == NULL) {
 		rv = ENOMEM;
 		goto errout;
@@ -663,6 +668,7 @@ errout:
 	free(rp);
 	if (rv != 0) {
 		free(*dp);
+		*dp = NULL;
 	}
 	return (rv);
 }

Modified: user/jeff/numa/sbin/ldconfig/ldconfig.8
==============================================================================
--- user/jeff/numa/sbin/ldconfig/ldconfig.8	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/sbin/ldconfig/ldconfig.8	Tue Jan  9 22:00:06 2018	(r327750)
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 19, 2013
+.Dd January 6, 2018
 .Dt LDCONFIG 8
 .Os
 .Sh NAME
@@ -58,7 +58,9 @@ the overhead that would otherwise result from the dire
 operations the dynamic linker would have to perform to load the
 required shared libraries.
 .Pp
-Files named on the command line are expected to contain directories
+Alternatively,
+.Ar files
+may be specified; these are expected to contain directories
 to scan for shared libraries.
 Each directory's pathname must start on a new
 line.
@@ -157,9 +159,10 @@ file.
 In particular, the
 .Ev LD_LIBRARY_PATH
 is not used to search for libraries.
-Thus, the role of ldconfig is dual.
-In
-addition to building a set of hints for quick lookup, it also serves to
+Thus, the role of
+.Nm
+is dual.
+In addition to building a set of hints for quick lookup, it also serves to
 specify the trusted collection of directories from which shared objects can
 be safely loaded.
 .Sh FILES

Modified: user/jeff/numa/sbin/newfs_msdos/mkfs_msdos.c
==============================================================================
--- user/jeff/numa/sbin/newfs_msdos/mkfs_msdos.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/sbin/newfs_msdos/mkfs_msdos.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -717,8 +717,10 @@ mkfs_msdos(const char *fname, const char *dtype, const
     rv = 0;
 done:
     free(img);
-    close(fd);
-    close(fd1);
+    if (fd != -1)
+	    close(fd);
+    if (fd1 != -1)
+	    close(fd1);
 
     return rv;
 }

Modified: user/jeff/numa/share/man/man4/aw_sid.4
==============================================================================
--- user/jeff/numa/share/man/man4/aw_sid.4	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/man/man4/aw_sid.4	Tue Jan  9 22:00:06 2018	(r327750)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 2, 2018
+.Dd January 6, 2018
 .Dt AW_SID 4
 .Os
 .Sh NAME
@@ -52,6 +52,8 @@ allwinner,sun7i-a20-sid
 allwinner,sun50i-a64-sid
 .It
 allwinner,sun8i-a83t-sid
+.It
+allwinner,sun8i-h3-sid
 .El
 .Sh SYSCTL VARIABLES
 The following read-only variables are available via

Modified: user/jeff/numa/share/man/man4/cxgbe.4
==============================================================================
--- user/jeff/numa/share/man/man4/cxgbe.4	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/man/man4/cxgbe.4	Tue Jan  9 22:00:06 2018	(r327750)
@@ -243,6 +243,13 @@ Permitted interrupt types.
 Bit 0 represents INTx (line interrupts), bit 1 MSI, and bit 2 MSI-X.
 The default is 7 (all allowed).
 The driver selects the best possible type out of the allowed types.
+.It Va hw.cxgbe.pcie_relaxed_ordering
+PCIe Relaxed Ordering.
+-1 indicates the driver should determine whether to enable or disable PCIe RO.
+0 disables PCIe RO.
+1 enables PCIe RO.
+2 indicates the driver should not modify the PCIe RO setting.
+The default is -1.
 .It Va hw.cxgbe.fw_install
 0 prohibits the driver from installing a firmware on the card.
 1 allows the driver to install a new firmware if internal driver

Modified: user/jeff/numa/share/man/man4/smp.4
==============================================================================
--- user/jeff/numa/share/man/man4/smp.4	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/man/man4/smp.4	Tue Jan  9 22:00:06 2018	(r327750)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 7, 2008
+.Dd January 6, 2018
 .Dt SMP 4
 .Os
 .Sh NAME
@@ -56,6 +56,11 @@ i386 also requires
 The
 .Xr mptable 1
 command may be used to view the status of multi-processor support.
+.Pp
+.Nm
+support can be disabled by setting the loader tunable
+.Va kern.smp.disabled
+to 1.
 .Pp
 The number of CPUs detected by the system is available in
 the read-only sysctl variable

Modified: user/jeff/numa/share/man/man5/core.5
==============================================================================
--- user/jeff/numa/share/man/man5/core.5	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/man/man5/core.5	Tue Jan  9 22:00:06 2018	(r327750)
@@ -28,7 +28,7 @@
 .\"     @(#)core.5	8.3 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd October 5, 2015
+.Dd January 8, 2018
 .Dt CORE 5
 .Os
 .Sh NAME
@@ -67,8 +67,8 @@ generating it).
 .Pp
 The following format specifiers may be used in the
 .Va kern.corefile
-sysctl to insert additional information into the resulting core file
-name:
+sysctl to insert additional information into the resulting core
+filename:
 .Bl -tag -width "1234567890" -compact -offset "12345"
 .It Em \&%H
 Machine hostname.
@@ -108,17 +108,17 @@ is included in the kernel configuration file:
 GZIO
 .El
 .Pp
-When the GZIO option is included, the following sysctls control whether core
-files will be compressed:
-.Bl -tag -width "kern.compress_user_cores_gzlevel" -compact -offset "12345"
-.It Em kern.compress_user_cores_gzlevel
-Gzip compression level.
-Defaults to 6.
+The following sysctl control core file compression:
+.Bl -tag -width "kern.compress_user_cores_level" -compact -offset "12345"
 .It Em kern.compress_user_cores
-Actually compress user cores.
-Compressed core files will have a suffix of
+Enable compression of user cores.
+A value of 1 configures gzip compression.
+gzip-compressed core files will have a suffix of
 .Ql .gz
-appended to them.
+appended to their filenames.
+.It Em kern.compress_user_cores_level
+Compression level.
+Defaults to 6.
 .El
 .Sh NOTES
 Corefiles are written with open file descriptor information as an ELF note.
@@ -153,6 +153,7 @@ command can be used:
 .Dl sysctl kern.corefile=/var/coredumps/\&%U/\&%N.core
 .Sh SEE ALSO
 .Xr gdb 1 ,
+.Xr gzip 1 ,
 .Xr kgdb 1 ,
 .Xr setrlimit 2 ,
 .Xr sigaction 2 ,

Modified: user/jeff/numa/share/man/man9/malloc.9
==============================================================================
--- user/jeff/numa/share/man/man9/malloc.9	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/man/man9/malloc.9	Tue Jan  9 22:00:06 2018	(r327750)
@@ -45,6 +45,8 @@
 .In sys/malloc.h
 .Ft void *
 .Fn malloc "unsigned long size" "struct malloc_type *type" "int flags"
+.Ft void *
+.Fn mallocarray "size_t nmemb" "size_t size" "struct malloc_type *type" "int flags"
 .Ft void
 .Fn free "void *addr" "struct malloc_type *type"
 .Ft void *
@@ -64,6 +66,14 @@ object whose size is specified by
 .Fa size .
 .Pp
 The
+.Fn mallocarray
+function allocates uninitialized memory in kernel address space for an
+array of
+.Fa nmemb
+entries whose size is specified by
+.Fa size .
+.Pp
+The
 .Fn free
 function releases memory at address
 .Fa addr
@@ -152,6 +162,15 @@ functions cannot return
 if
 .Dv M_WAITOK
 is specified.
+The
+.Fn mallocarray
+function can return
+.Dv NULL
+if the multiplication of
+.Fa nmemb
+and
+.Fa size
+would cause an integer overflow.
 .It Dv M_USE_RESERVE
 Indicates that the system can use its reserve of memory to satisfy the
 request.

Modified: user/jeff/numa/share/misc/bsd-family-tree
==============================================================================
--- user/jeff/numa/share/misc/bsd-family-tree	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/misc/bsd-family-tree	Tue Jan  9 22:00:06 2018	(r327750)
@@ -355,28 +355,22 @@ FreeBSD 5.2           |      |                 |      
  |   11.0     |     10.12   | | NetBSD 7.0.2   |                       |
  |     |      |       |     | |                |                       |
  |     |      |       |     | *- NetBSD 7.1    |                       |
- |     |      |     macOS   |       |          |               DragonFly 4.8.0
- |     |      |     10.13   |       |     OpenBSD 6.1                  |
- |  FreeBSD   |       |     |       |          |               DragonFly 5.0.0
- |   11.1  FreeBSD    |     |       |          |                       |
- |     |    10.4      |     |       |     OpenBSD 6.2          DragonFly 5.0.1
- |     |      |       v     |       |          |                       |
- |     |      |             |       |          |               DragonFly 5.0.2
- |     |      |             |       |          |                       |
- |     |   FreeBSD          |  NetBSD 7.1.1    |                       |
- |     |   10-stable        |                  |                       |
- |  FreeBSD    \            |                  |                       |
- |  11-stable   \           |                  |                       |
- |    /          `|         |                  |                       |
- | HardenedBSD    |         |                  |                       |
- |  11-stable  HardenedBSD  |                  |                       |
- |              10-stable   |                  |                       |
- |                          |                  |                       |
- |                          |                  |                       |
- |                          |                  |                       |
-FreeBSD 12 -current   NetBSD -current   OpenBSD -current    DragonFly -current
- |                          |                  |                       |
- v                          v                  v                       v
+ |     |      |       |     |      |           |                       |
+ |     |      |       |     |      |           |                       |
+ |     |      |     macOS   |      |           |               DragonFly 4.8.0
+ |     |      |     10.13   |      |      OpenBSD 6.1                  |
+ |  FreeBSD   |       |     |      |           |               DragonFly 5.0.0
+ |   11.1  FreeBSD    |     |      |           |                       |
+ |     |    10.4      |     |      |      OpenBSD 6.2          DragonFly 5.0.1
+ |     |              |     |      |           |                       |
+ |     |              |     |  NetBSD 7.1.1    |               DragonFly 5.0.2
+ |     |              |     |      |           |                       |
+ |     |              |     |      v           |                       |
+ |     v              |     |                  |                       |
+ |                    |     |                  |                       |
+FreeBSD 12 -current   | NetBSD -current   OpenBSD -current    DragonFly -current
+ |                    |     |                  |                       |
+ v                    v     v                  v                       v
 
 Time
 ----------------

Modified: user/jeff/numa/share/misc/organization.dot
==============================================================================
--- user/jeff/numa/share/misc/organization.dot	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/share/misc/organization.dot	Tue Jan  9 22:00:06 2018	(r327750)
@@ -34,7 +34,7 @@ portmgr [label="Port Management Team\nportmgr at FreeBSD.
 portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary at FreeBSD.org\nrene"]
 re [label="Primary Release Engineering Team\nre at FreeBSD.org\ngjb, kib,\nbdrewery, blackend,\nrgrimes, delphij,\nhrs, glebius,\nmarius, rwatson"]
 secteam [label="Security Team\nsecteam at FreeBSD.org\ndelphij,\ndes, gavin, gjb,\nglebius, remko"]
-portssecteam [label="Ports Security Team\nports-secteam at FreeBSD.org\ndelphij, amdmi3, eadler, feld, jgh, junovitch, rea, sbz, simon, swills, zi"]
+portssecteam [label="Ports Security Team\nports-secteam at FreeBSD.org\ndelphij, amdmi3, eadler, feld, jgh, rea, sbz, simon, swills, zi"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary at FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer at FreeBSD.org\ndelphij, des,\ngavin, gjb,\nglebius, remko"]
 srccommitters [label="Src Committers\nsrc-committers at FreeBSD.org"]

Modified: user/jeff/numa/stand/i386/libfirewire/firewire.c
==============================================================================
--- user/jeff/numa/stand/i386/libfirewire/firewire.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/i386/libfirewire/firewire.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -108,11 +108,11 @@ fw_probe(int index, struct fwohci_softc *sc)
 	biospci_write_config(sc->locator,
 		0x4	/* command */,
 		0x6	/* enable bus master and memory mapped I/O */,
-		1	/* word */);
+		BIOSPCI_16BITS);
 
-	biospci_read_config(sc->locator, 0x00 /*devid*/, 2 /*dword*/,
+	biospci_read_config(sc->locator, 0x00 /*devid*/, BIOSPCI_32BITS,
 		&sc->devid);
-	biospci_read_config(sc->locator, 0x10 /*base_addr*/, 2 /*dword*/,
+	biospci_read_config(sc->locator, 0x10 /*base_addr*/, BIOSPCI_32BITS,
 		&sc->base_addr);
 
         sc->handle = (uint32_t)PTOV(sc->base_addr);

Modified: user/jeff/numa/stand/i386/libi386/biospci.c
==============================================================================
--- user/jeff/numa/stand/i386/libi386/biospci.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/i386/libi386/biospci.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -285,7 +285,7 @@ biospci_enumerate(void)
 			break;
 
 		    /* Read the device identifier from the nominated device */
-		    err = biospci_read_config(locator, 0, 2, &devid);
+		    err = biospci_read_config(locator, 0, BIOSPCI_32BITS, &devid);
 		    if (err != 0)
 			break;
 		    

Modified: user/jeff/numa/stand/i386/libi386/comconsole.c
==============================================================================
--- user/jeff/numa/stand/i386/libi386/comconsole.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/i386/libi386/comconsole.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -263,8 +263,18 @@ comc_pcidev_handle(uint32_t locator)
 	uint32_t port;
 
 	if (biospci_read_config(locator & 0xffff,
-				(locator & 0xff0000) >> 16, 2, &port) == -1) {
+	    (locator & 0xff0000) >> 16, BIOSPCI_32BITS, &port) == -1) {
 		printf("Cannot read bar at 0x%x\n", locator);
+		return (CMD_ERROR);
+	}
+
+	/* 
+	 * biospci_read_config() sets port == 0xffffffff if the pcidev
+	 * isn't found on the bus.  Check for 0xffffffff and return to not
+	 * panic in BTX.
+	 */
+	if (port == 0xffffffff) {
+		printf("Cannot find specified pcidev\n");
 		return (CMD_ERROR);
 	}
 	if (!PCI_BAR_IO(port)) {

Modified: user/jeff/numa/stand/i386/libi386/libi386.h
==============================================================================
--- user/jeff/numa/stand/i386/libi386/libi386.h	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/i386/libi386/libi386.h	Tue Jan  9 22:00:06 2018	(r327750)
@@ -135,6 +135,13 @@ extern vm_offset_t	memtop_copyin;	/* memtop less heap 
 extern uint32_t		high_heap_size;	/* extended memory region available */
 extern vm_offset_t	high_heap_base;	/* for use as the heap */
 
+/*
+ * Values for width parameter to biospci_{read,write}_config
+ */
+#define BIOSPCI_8BITS	0
+#define BIOSPCI_16BITS	1
+#define BIOSPCI_32BITS	2
+
 void	biospci_detect(void);
 int	biospci_find_devclass(uint32_t class, int index, uint32_t *locator);
 int	biospci_read_config(uint32_t locator, int offset, int width, uint32_t *val);

Modified: user/jeff/numa/stand/mips/beri/boot2/Makefile
==============================================================================
--- user/jeff/numa/stand/mips/beri/boot2/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/boot2/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -53,8 +53,7 @@ CFLAGS+=	-I${LDRSRC}			\
 		-fno-pic -mno-abicalls		\
 		-g
 
-LDFLAGS=	-nostdlib			\
-		-static				\
+LDFLAGS+=	-static				\
 		-Wl,-N				\
 		-G0				\
 		-L${.CURDIR}

Modified: user/jeff/numa/stand/mips/beri/boot2/boot2.c
==============================================================================
--- user/jeff/numa/stand/mips/beri/boot2/boot2.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/boot2/boot2.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -118,8 +118,6 @@ static const unsigned char flags[NOPT] = {
 static const char *const dev_nm[] = {"dram", "cfi", "sdcard"};
 static const u_int dev_nm_count = nitems(dev_nm);
 
-static struct dmadat __dmadat;
-
 static struct dsk {
     unsigned type;		/* BOOTINFO_DEV_TYPE_x object type. */
     uintptr_t unitptr;		/* Unit number or pointer to object. */
@@ -149,9 +147,10 @@ static int dskread(void *, unsigned, unsigned);
 static int xputc(int);
 static int xgetc(int);
 
-
 #define	UFS_SMALL_CGBASE
 #include "ufsread.c"
+
+static struct dmadat __dmadat;
 
 static inline int
 xfsread(ufs_ino_t inode, void *buf, size_t nbyte)

Modified: user/jeff/numa/stand/mips/beri/common/sdcard.c
==============================================================================
--- user/jeff/numa/stand/mips/beri/common/sdcard.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/common/sdcard.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -33,8 +33,7 @@
 #include <sys/types.h>
 #include <sys/endian.h>
 
-#include <inttypes.h>
-#include <stdio.h>
+#include <stand.h>
 
 
 /*
@@ -109,10 +108,10 @@
     ALTERA_SDCARD_RR1_COMMANDCRCFAILED | ALTERA_SDCARD_RR1_ADDRESSMISALIGNED |\
     ALTERA_SDCARD_RR1_ADDRBLOCKRANGE)
 
-extern void __cheri_sdcard_vaddr__;
+extern uint8_t __cheri_sdcard_vaddr__[];
 
 #define	ALTERA_SDCARD_PTR(type, offset)					\
-	(volatile type *)((uint8_t *)&__cheri_sdcard_vaddr__ + (offset))
+	(volatile type *)(&__cheri_sdcard_vaddr__[(offset)])
 
 static __inline uint16_t
 altera_sdcard_read_uint16(u_int offset)

Modified: user/jeff/numa/stand/mips/beri/loader/Makefile
==============================================================================
--- user/jeff/numa/stand/mips/beri/loader/Makefile	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/loader/Makefile	Tue Jan  9 22:00:06 2018	(r327750)
@@ -85,8 +85,7 @@ CFLAGS+=	-G0					\
 		-mno-abicalls				\
 		-g
 
-LDFLAGS=	-nostdlib				\
-		-static					\
+LDFLAGS+=	-static					\
 		-T ${.CURDIR}/loader.ldscript		\
 		-L${.CURDIR}				\
 		-e __start

Modified: user/jeff/numa/stand/mips/beri/loader/exec.c
==============================================================================
--- user/jeff/numa/stand/mips/beri/loader/exec.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/loader/exec.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -80,14 +80,14 @@ beri_elf64_exec(struct preloaded_file *fp)
 
 	md = file_findmetadata(fp, MODINFOMD_ELFHDR);
 	if (md == NULL) {
-		printf("%s: file_findmetadata failed\n");
+		printf("%s: file_findmetadata failed\n", fp->f_name);
 		return (EFTYPE);
 	}
 	ehdr = (Elf_Ehdr *)md->md_data;
 
 	error = md_load64(fp->f_args, &mdp);
 	if (error) {
-		printf("%s: md_load64 failed\n");
+		printf("%s: md_load64 failed\n", fp->f_name);
 		return (error);
 	}
 

Modified: user/jeff/numa/stand/mips/beri/loader/main.c
==============================================================================
--- user/jeff/numa/stand/mips/beri/loader/main.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/stand/mips/beri/loader/main.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -78,8 +78,8 @@ struct console *consoles[] = {
 	NULL
 };
 
-extern void	__bss_start, __bss_end;
-extern void	__heap_start, __heap_end;
+extern uint8_t	__bss_start, __bss_end;
+extern uint8_t	__heap_start, __heap_end;
 
 static int
 __elfN(exec)(struct preloaded_file *fp)
@@ -108,14 +108,14 @@ main(int argc, char *argv[], char *envv[], struct boot
 	struct devsw **dp;
 
 	/* NB: Must be sure to bzero() before using any globals. */
-	bzero(&__bss_start, (uintptr_t)&__bss_end - (uintptr_t)&__bss_start);
+	bzero(&__bss_start, &__bss_end - &__bss_start);
 
 	boot2_argc = argc;
 	boot2_argv = argv;
 	boot2_envv = envv;
 	boot2_bootinfo = *bootinfop;	/* Copy rather than by reference. */
 
-	setheap((void *)&__heap_start, (void *)&__heap_end);
+	setheap(&__heap_start, &__heap_end);
 
 	/*
 	 * Pick up console settings from boot2; probe console.

Modified: user/jeff/numa/sys/amd64/amd64/machdep.c
==============================================================================
--- user/jeff/numa/sys/amd64/amd64/machdep.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/sys/amd64/amd64/machdep.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -1535,7 +1535,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 
 	kmdp = init_ops.parse_preload_data(modulep);
 
-	identify_cpu();
+	identify_cpu1();
 	identify_hypervisor();
 
 	/* Init basic tunables, hz etc */

Modified: user/jeff/numa/sys/amd64/vmm/amd/svm.c
==============================================================================
--- user/jeff/numa/sys/amd64/vmm/amd/svm.c	Tue Jan  9 21:54:37 2018	(r327749)
+++ user/jeff/numa/sys/amd64/vmm/amd/svm.c	Tue Jan  9 22:00:06 2018	(r327750)
@@ -517,15 +517,26 @@ svm_vminit(struct vm *vm, pmap_t pmap)
 	vm_paddr_t msrpm_pa, iopm_pa, pml4_pa;
 	int i;
 
-	svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO,
-	    0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
+	svm_sc = malloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO);
+	if (((uintptr_t)svm_sc & PAGE_MASK) != 0)
+		panic("malloc of svm_softc not aligned on page boundary");
+
+	svm_sc->msr_bitmap = contigmalloc(SVM_MSR_BITMAP_SIZE, M_SVM,
+	    M_WAITOK, 0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
+	if (svm_sc->msr_bitmap == NULL)
+		panic("contigmalloc of SVM MSR bitmap failed");
+	svm_sc->iopm_bitmap = contigmalloc(SVM_IO_BITMAP_SIZE, M_SVM,
+	    M_WAITOK, 0, ~(vm_paddr_t)0, PAGE_SIZE, 0);
+	if (svm_sc->iopm_bitmap == NULL)
+		panic("contigmalloc of SVM IO bitmap failed");
+
 	svm_sc->vm = vm;
 	svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4);
 
 	/*
 	 * Intercept read and write accesses to all MSRs.
 	 */
-	memset(svm_sc->msr_bitmap, 0xFF, sizeof(svm_sc->msr_bitmap));
+	memset(svm_sc->msr_bitmap, 0xFF, SVM_MSR_BITMAP_SIZE);
 
 	/*
 	 * Access to the following MSRs is redirected to the VMCB when the
@@ -553,7 +564,7 @@ svm_vminit(struct vm *vm, pmap_t pmap)
 	svm_msr_rd_ok(svm_sc->msr_bitmap, MSR_EFER);
 
 	/* Intercept access to all I/O ports. */
-	memset(svm_sc->iopm_bitmap, 0xFF, sizeof(svm_sc->iopm_bitmap));
+	memset(svm_sc->iopm_bitmap, 0xFF, SVM_IO_BITMAP_SIZE);
 
 	iopm_pa = vtophys(svm_sc->iopm_bitmap);
 	msrpm_pa = vtophys(svm_sc->msr_bitmap);
@@ -2043,7 +2054,9 @@ svm_vmcleanup(void *arg)

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

More information about the svn-src-user mailing list