Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 May 2013 13:28:19 +0000 (UTC)
From:      Attilio Rao <attilio@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r250269 - in user/attilio/vmcontention: . bin/cat bin/dd bin/df bin/domainname bin/hostname bin/kill bin/mkdir bin/rm bin/sh cddl/contrib/opensolaris/lib/libdtrace/common cddl/contrib/o...
Message-ID:  <201305051328.r45DSJSO090676@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: attilio
Date: Sun May  5 13:28:18 2013
New Revision: 250269
URL: http://svnweb.freebsd.org/changeset/base/250269

Log:
  MFC

Added:
  user/attilio/vmcontention/contrib/sendmail/libsm/t-fget.c
     - copied unchanged from r250268, head/contrib/sendmail/libsm/t-fget.c
  user/attilio/vmcontention/lib/msun/x86/
     - copied from r250268, head/lib/msun/x86/
  user/attilio/vmcontention/release/picobsd/floppy.tree/etc/ssh/
     - copied from r250268, head/release/picobsd/floppy.tree/etc/ssh/
  user/attilio/vmcontention/share/examples/BSD_daemon/beastie2.eps
     - copied unchanged from r250268, head/share/examples/BSD_daemon/beastie2.eps
  user/attilio/vmcontention/share/man/man4/man4.arm/devcfg.4
     - copied unchanged from r250268, head/share/man/man4/man4.arm/devcfg.4
  user/attilio/vmcontention/share/man/man4/ntb.4
     - copied unchanged from r250268, head/share/man/man4/ntb.4
  user/attilio/vmcontention/sys/arm/conf/ZEDBOARD
     - copied unchanged from r250268, head/sys/arm/conf/ZEDBOARD
  user/attilio/vmcontention/sys/arm/xilinx/
     - copied from r250268, head/sys/arm/xilinx/
  user/attilio/vmcontention/sys/boot/fdt/dts/am335x.dtsi
     - copied unchanged from r250268, head/sys/boot/fdt/dts/am335x.dtsi
  user/attilio/vmcontention/sys/boot/fdt/dts/zedboard.dts
     - copied unchanged from r250268, head/sys/boot/fdt/dts/zedboard.dts
  user/attilio/vmcontention/sys/contrib/dev/ath/
     - copied from r250268, head/sys/contrib/dev/ath/
  user/attilio/vmcontention/sys/dev/cadence/
     - copied from r250268, head/sys/dev/cadence/
  user/attilio/vmcontention/sys/dev/ntb/
     - copied from r250268, head/sys/dev/ntb/
  user/attilio/vmcontention/sys/dev/sdhci/sdhci_fdt.c
     - copied unchanged from r250268, head/sys/dev/sdhci/sdhci_fdt.c
  user/attilio/vmcontention/sys/modules/ntb/
     - copied from r250268, head/sys/modules/ntb/
  user/attilio/vmcontention/tools/regression/bin/sh/builtins/read7.0
     - copied unchanged from r250268, head/tools/regression/bin/sh/builtins/read7.0
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.0.in
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.0.in
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.0.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.0.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.0I.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.0I.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.0J.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.0J.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.0L.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.0L.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.n1.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.n1.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.n2.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.n2.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.n3.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.n3.out
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.quotes.in
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.quotes.in
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.quotes.out
     - copied unchanged from r250268, head/tools/regression/usr.bin/xargs/regress.quotes.out
  user/attilio/vmcontention/tools/tools/ath/athalq/txdiff.pl
     - copied unchanged from r250268, head/tools/tools/ath/athalq/txdiff.pl
Deleted:
  user/attilio/vmcontention/gnu/usr.bin/cc/f77/
  user/attilio/vmcontention/gnu/usr.bin/cc/f771/
  user/attilio/vmcontention/gnu/usr.bin/cc/f77doc/
  user/attilio/vmcontention/lib/msun/amd64/fenv.h
  user/attilio/vmcontention/lib/msun/i387/fenv.h
  user/attilio/vmcontention/release/picobsd/floppy.tree/etc/sshd_config
  user/attilio/vmcontention/tools/build/options/WITH_IDEA
Modified:
  user/attilio/vmcontention/MAINTAINERS   (contents, props changed)
  user/attilio/vmcontention/Makefile.inc1
  user/attilio/vmcontention/UPDATING
  user/attilio/vmcontention/bin/cat/cat.c
  user/attilio/vmcontention/bin/dd/dd.c
  user/attilio/vmcontention/bin/df/df.c
  user/attilio/vmcontention/bin/domainname/domainname.1
  user/attilio/vmcontention/bin/hostname/hostname.c
  user/attilio/vmcontention/bin/kill/kill.c
  user/attilio/vmcontention/bin/mkdir/mkdir.c
  user/attilio/vmcontention/bin/rm/rm.1
  user/attilio/vmcontention/bin/rm/rm.c
  user/attilio/vmcontention/bin/sh/input.c
  user/attilio/vmcontention/bin/sh/jobs.c
  user/attilio/vmcontention/bin/sh/main.c
  user/attilio/vmcontention/bin/sh/miscbltin.c
  user/attilio/vmcontention/bin/sh/redir.c
  user/attilio/vmcontention/bin/sh/sh.1
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/attilio/vmcontention/contrib/binutils/binutils/arlex.l
  user/attilio/vmcontention/contrib/binutils/ld/ldlex.l
  user/attilio/vmcontention/contrib/bmake/var.c
  user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII.c
  user/attilio/vmcontention/contrib/libc++/CREDITS.TXT
  user/attilio/vmcontention/contrib/libc++/LICENSE.TXT
  user/attilio/vmcontention/contrib/libc++/include/__bit_reference
  user/attilio/vmcontention/contrib/libc++/include/__config
  user/attilio/vmcontention/contrib/libc++/include/__debug
  user/attilio/vmcontention/contrib/libc++/include/__functional_03
  user/attilio/vmcontention/contrib/libc++/include/__functional_base
  user/attilio/vmcontention/contrib/libc++/include/__functional_base_03
  user/attilio/vmcontention/contrib/libc++/include/__hash_table
  user/attilio/vmcontention/contrib/libc++/include/__locale
  user/attilio/vmcontention/contrib/libc++/include/__mutex_base
  user/attilio/vmcontention/contrib/libc++/include/__std_stream
  user/attilio/vmcontention/contrib/libc++/include/__tree
  user/attilio/vmcontention/contrib/libc++/include/__tuple
  user/attilio/vmcontention/contrib/libc++/include/__tuple_03
  user/attilio/vmcontention/contrib/libc++/include/algorithm
  user/attilio/vmcontention/contrib/libc++/include/array
  user/attilio/vmcontention/contrib/libc++/include/bitset
  user/attilio/vmcontention/contrib/libc++/include/chrono
  user/attilio/vmcontention/contrib/libc++/include/codecvt
  user/attilio/vmcontention/contrib/libc++/include/complex
  user/attilio/vmcontention/contrib/libc++/include/condition_variable
  user/attilio/vmcontention/contrib/libc++/include/cstddef
  user/attilio/vmcontention/contrib/libc++/include/cstring
  user/attilio/vmcontention/contrib/libc++/include/cwchar
  user/attilio/vmcontention/contrib/libc++/include/deque
  user/attilio/vmcontention/contrib/libc++/include/exception
  user/attilio/vmcontention/contrib/libc++/include/ext/__hash
  user/attilio/vmcontention/contrib/libc++/include/ext/hash_map
  user/attilio/vmcontention/contrib/libc++/include/ext/hash_set
  user/attilio/vmcontention/contrib/libc++/include/forward_list
  user/attilio/vmcontention/contrib/libc++/include/fstream
  user/attilio/vmcontention/contrib/libc++/include/functional
  user/attilio/vmcontention/contrib/libc++/include/future
  user/attilio/vmcontention/contrib/libc++/include/initializer_list
  user/attilio/vmcontention/contrib/libc++/include/ios
  user/attilio/vmcontention/contrib/libc++/include/iosfwd
  user/attilio/vmcontention/contrib/libc++/include/iostream
  user/attilio/vmcontention/contrib/libc++/include/istream
  user/attilio/vmcontention/contrib/libc++/include/iterator
  user/attilio/vmcontention/contrib/libc++/include/limits
  user/attilio/vmcontention/contrib/libc++/include/list
  user/attilio/vmcontention/contrib/libc++/include/locale
  user/attilio/vmcontention/contrib/libc++/include/map
  user/attilio/vmcontention/contrib/libc++/include/memory
  user/attilio/vmcontention/contrib/libc++/include/mutex
  user/attilio/vmcontention/contrib/libc++/include/new
  user/attilio/vmcontention/contrib/libc++/include/ostream
  user/attilio/vmcontention/contrib/libc++/include/queue
  user/attilio/vmcontention/contrib/libc++/include/random
  user/attilio/vmcontention/contrib/libc++/include/ratio
  user/attilio/vmcontention/contrib/libc++/include/regex
  user/attilio/vmcontention/contrib/libc++/include/scoped_allocator
  user/attilio/vmcontention/contrib/libc++/include/set
  user/attilio/vmcontention/contrib/libc++/include/sstream
  user/attilio/vmcontention/contrib/libc++/include/stack
  user/attilio/vmcontention/contrib/libc++/include/streambuf
  user/attilio/vmcontention/contrib/libc++/include/string
  user/attilio/vmcontention/contrib/libc++/include/strstream
  user/attilio/vmcontention/contrib/libc++/include/system_error
  user/attilio/vmcontention/contrib/libc++/include/thread
  user/attilio/vmcontention/contrib/libc++/include/tuple
  user/attilio/vmcontention/contrib/libc++/include/type_traits
  user/attilio/vmcontention/contrib/libc++/include/typeindex
  user/attilio/vmcontention/contrib/libc++/include/unordered_map
  user/attilio/vmcontention/contrib/libc++/include/unordered_set
  user/attilio/vmcontention/contrib/libc++/include/utility
  user/attilio/vmcontention/contrib/libc++/include/valarray
  user/attilio/vmcontention/contrib/libc++/include/vector
  user/attilio/vmcontention/contrib/libc++/src/chrono.cpp
  user/attilio/vmcontention/contrib/libc++/src/debug.cpp
  user/attilio/vmcontention/contrib/libc++/src/exception.cpp
  user/attilio/vmcontention/contrib/libc++/src/hash.cpp
  user/attilio/vmcontention/contrib/libc++/src/iostream.cpp
  user/attilio/vmcontention/contrib/libc++/src/locale.cpp
  user/attilio/vmcontention/contrib/libc++/src/memory.cpp
  user/attilio/vmcontention/contrib/libc++/src/new.cpp
  user/attilio/vmcontention/contrib/libc++/src/stdexcept.cpp
  user/attilio/vmcontention/contrib/libc++/src/string.cpp
  user/attilio/vmcontention/contrib/libc++/src/strstream.cpp
  user/attilio/vmcontention/contrib/libc++/src/system_error.cpp
  user/attilio/vmcontention/contrib/libc++/src/thread.cpp
  user/attilio/vmcontention/contrib/libc++/src/typeinfo.cpp
  user/attilio/vmcontention/contrib/libcxxrt/atomic.h
  user/attilio/vmcontention/contrib/libcxxrt/exception.cc
  user/attilio/vmcontention/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  user/attilio/vmcontention/contrib/sendmail/CACerts
  user/attilio/vmcontention/contrib/sendmail/FREEBSD-upgrade
  user/attilio/vmcontention/contrib/sendmail/PGPKEYS
  user/attilio/vmcontention/contrib/sendmail/RELEASE_NOTES
  user/attilio/vmcontention/contrib/sendmail/cf/cf/submit.cf
  user/attilio/vmcontention/contrib/sendmail/cf/m4/version.m4
  user/attilio/vmcontention/contrib/sendmail/contrib/etrn.pl
  user/attilio/vmcontention/contrib/sendmail/doc/op/op.me
  user/attilio/vmcontention/contrib/sendmail/include/sm/config.h
  user/attilio/vmcontention/contrib/sendmail/include/sm/io.h
  user/attilio/vmcontention/contrib/sendmail/libmilter/Makefile.m4
  user/attilio/vmcontention/contrib/sendmail/libmilter/sm_gethost.c
  user/attilio/vmcontention/contrib/sendmail/libsm/Makefile.m4
  user/attilio/vmcontention/contrib/sendmail/libsm/cf.c
  user/attilio/vmcontention/contrib/sendmail/libsm/fget.c
  user/attilio/vmcontention/contrib/sendmail/mailstats/mailstats.c
  user/attilio/vmcontention/contrib/sendmail/makemap/makemap.c
  user/attilio/vmcontention/contrib/sendmail/praliases/praliases.c
  user/attilio/vmcontention/contrib/sendmail/rmail/rmail.c
  user/attilio/vmcontention/contrib/sendmail/src/Makefile.m4
  user/attilio/vmcontention/contrib/sendmail/src/alias.c
  user/attilio/vmcontention/contrib/sendmail/src/collect.c
  user/attilio/vmcontention/contrib/sendmail/src/conf.c
  user/attilio/vmcontention/contrib/sendmail/src/control.c
  user/attilio/vmcontention/contrib/sendmail/src/deliver.c
  user/attilio/vmcontention/contrib/sendmail/src/main.c
  user/attilio/vmcontention/contrib/sendmail/src/map.c
  user/attilio/vmcontention/contrib/sendmail/src/mci.c
  user/attilio/vmcontention/contrib/sendmail/src/milter.c
  user/attilio/vmcontention/contrib/sendmail/src/mime.c
  user/attilio/vmcontention/contrib/sendmail/src/parseaddr.c
  user/attilio/vmcontention/contrib/sendmail/src/queue.c
  user/attilio/vmcontention/contrib/sendmail/src/readcf.c
  user/attilio/vmcontention/contrib/sendmail/src/recipient.c
  user/attilio/vmcontention/contrib/sendmail/src/savemail.c
  user/attilio/vmcontention/contrib/sendmail/src/sendmail.h
  user/attilio/vmcontention/contrib/sendmail/src/sfsasl.c
  user/attilio/vmcontention/contrib/sendmail/src/srvrsmtp.c
  user/attilio/vmcontention/contrib/sendmail/src/tls.c
  user/attilio/vmcontention/contrib/sendmail/src/usersmtp.c
  user/attilio/vmcontention/contrib/sendmail/src/util.c
  user/attilio/vmcontention/contrib/sendmail/src/version.c
  user/attilio/vmcontention/contrib/sendmail/test/Makefile.m4
  user/attilio/vmcontention/contrib/sendmail/vacation/vacation.c
  user/attilio/vmcontention/contrib/smbfs/lib/smb/ctx.c
  user/attilio/vmcontention/contrib/smbfs/mount_smbfs/mount_smbfs.c
  user/attilio/vmcontention/crypto/openssh/readconf.c
  user/attilio/vmcontention/crypto/openssh/readconf.h
  user/attilio/vmcontention/crypto/openssh/ssh.c
  user/attilio/vmcontention/etc/Makefile
  user/attilio/vmcontention/etc/rc.d/ip6addrctl
  user/attilio/vmcontention/etc/rc.d/mountlate
  user/attilio/vmcontention/etc/sendmail/freebsd.mc
  user/attilio/vmcontention/etc/sendmail/freebsd.submit.mc
  user/attilio/vmcontention/gnu/usr.bin/gdb/kgdb/trgt_mips.c
  user/attilio/vmcontention/include/stringlist.h
  user/attilio/vmcontention/include/tgmath.h
  user/attilio/vmcontention/include/unistd.h
  user/attilio/vmcontention/kerberos5/lib/libgssapi_krb5/pname_to_uid.c
  user/attilio/vmcontention/lib/Makefile
  user/attilio/vmcontention/lib/clang/include/llvm/Config/config.h
  user/attilio/vmcontention/lib/libc/gen/errlst.c
  user/attilio/vmcontention/lib/libc/gen/stringlist.3
  user/attilio/vmcontention/lib/libc/gen/stringlist.c
  user/attilio/vmcontention/lib/libc/gen/sysconf.3
  user/attilio/vmcontention/lib/libc/locale/duplocale.3
  user/attilio/vmcontention/lib/libc/locale/freelocale.3
  user/attilio/vmcontention/lib/libc/locale/newlocale.3
  user/attilio/vmcontention/lib/libc/locale/querylocale.3
  user/attilio/vmcontention/lib/libc/locale/uselocale.3
  user/attilio/vmcontention/lib/libc/locale/xlocale.3
  user/attilio/vmcontention/lib/libc/net/nslexer.l
  user/attilio/vmcontention/lib/libc/nls/C.msg
  user/attilio/vmcontention/lib/libc/stdio/asprintf.c
  user/attilio/vmcontention/lib/libc/stdio/clrerr.c
  user/attilio/vmcontention/lib/libc/stdio/fclose.c
  user/attilio/vmcontention/lib/libc/stdio/fdopen.c
  user/attilio/vmcontention/lib/libc/stdio/feof.c
  user/attilio/vmcontention/lib/libc/stdio/ferror.c
  user/attilio/vmcontention/lib/libc/stdio/fflush.c
  user/attilio/vmcontention/lib/libc/stdio/fgetc.c
  user/attilio/vmcontention/lib/libc/stdio/fgetln.c
  user/attilio/vmcontention/lib/libc/stdio/fgetpos.c
  user/attilio/vmcontention/lib/libc/stdio/fgets.c
  user/attilio/vmcontention/lib/libc/stdio/fileno.c
  user/attilio/vmcontention/lib/libc/stdio/findfp.c
  user/attilio/vmcontention/lib/libc/stdio/flags.c
  user/attilio/vmcontention/lib/libc/stdio/fopen.c
  user/attilio/vmcontention/lib/libc/stdio/fprintf.c
  user/attilio/vmcontention/lib/libc/stdio/fpurge.c
  user/attilio/vmcontention/lib/libc/stdio/fputc.c
  user/attilio/vmcontention/lib/libc/stdio/fputs.c
  user/attilio/vmcontention/lib/libc/stdio/fread.c
  user/attilio/vmcontention/lib/libc/stdio/freopen.c
  user/attilio/vmcontention/lib/libc/stdio/fscanf.c
  user/attilio/vmcontention/lib/libc/stdio/fseek.c
  user/attilio/vmcontention/lib/libc/stdio/fsetpos.c
  user/attilio/vmcontention/lib/libc/stdio/ftell.c
  user/attilio/vmcontention/lib/libc/stdio/funopen.c
  user/attilio/vmcontention/lib/libc/stdio/fvwrite.c
  user/attilio/vmcontention/lib/libc/stdio/fwalk.c
  user/attilio/vmcontention/lib/libc/stdio/fwrite.c
  user/attilio/vmcontention/lib/libc/stdio/getc.c
  user/attilio/vmcontention/lib/libc/stdio/getchar.c
  user/attilio/vmcontention/lib/libc/stdio/gets.c
  user/attilio/vmcontention/lib/libc/stdio/getw.c
  user/attilio/vmcontention/lib/libc/stdio/makebuf.c
  user/attilio/vmcontention/lib/libc/stdio/mktemp.c
  user/attilio/vmcontention/lib/libc/stdio/perror.c
  user/attilio/vmcontention/lib/libc/stdio/printf-pos.c
  user/attilio/vmcontention/lib/libc/stdio/printf.c
  user/attilio/vmcontention/lib/libc/stdio/putc.c
  user/attilio/vmcontention/lib/libc/stdio/putchar.c
  user/attilio/vmcontention/lib/libc/stdio/puts.c
  user/attilio/vmcontention/lib/libc/stdio/putw.c
  user/attilio/vmcontention/lib/libc/stdio/refill.c
  user/attilio/vmcontention/lib/libc/stdio/remove.c
  user/attilio/vmcontention/lib/libc/stdio/rewind.c
  user/attilio/vmcontention/lib/libc/stdio/rget.c
  user/attilio/vmcontention/lib/libc/stdio/scanf.c
  user/attilio/vmcontention/lib/libc/stdio/setbuf.c
  user/attilio/vmcontention/lib/libc/stdio/setbuffer.c
  user/attilio/vmcontention/lib/libc/stdio/setvbuf.c
  user/attilio/vmcontention/lib/libc/stdio/snprintf.c
  user/attilio/vmcontention/lib/libc/stdio/sprintf.c
  user/attilio/vmcontention/lib/libc/stdio/sscanf.c
  user/attilio/vmcontention/lib/libc/stdio/stdio.c
  user/attilio/vmcontention/lib/libc/stdio/tempnam.c
  user/attilio/vmcontention/lib/libc/stdio/tmpfile.c
  user/attilio/vmcontention/lib/libc/stdio/tmpnam.c
  user/attilio/vmcontention/lib/libc/stdio/ungetc.c
  user/attilio/vmcontention/lib/libc/stdio/vfprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vfscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vfwprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vfwscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vsnprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vsprintf.c
  user/attilio/vmcontention/lib/libc/stdio/vsscanf.c
  user/attilio/vmcontention/lib/libc/stdio/vswscanf.c
  user/attilio/vmcontention/lib/libc/stdio/wbuf.c
  user/attilio/vmcontention/lib/libc/stdio/wsetup.c
  user/attilio/vmcontention/lib/libc/stdlib/lsearch.3
  user/attilio/vmcontention/lib/libc/sys/Makefile.inc
  user/attilio/vmcontention/lib/libc/sys/Symbol.map
  user/attilio/vmcontention/lib/libc/sys/accept.2
  user/attilio/vmcontention/lib/libc/sys/cpuset.2
  user/attilio/vmcontention/lib/libc/sys/cpuset_getaffinity.2
  user/attilio/vmcontention/lib/libc/sys/dup.2
  user/attilio/vmcontention/lib/libc/sys/getdtablesize.2
  user/attilio/vmcontention/lib/libc/sys/intro.2
  user/attilio/vmcontention/lib/libc/sys/pipe.2
  user/attilio/vmcontention/lib/libcompiler_rt/Makefile
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_add_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_add_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_and_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_and_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_op_n.h
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_or_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_or_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
  user/attilio/vmcontention/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
  user/attilio/vmcontention/lib/libipsec/policy_token.l
  user/attilio/vmcontention/lib/libkvm/kvm.c
  user/attilio/vmcontention/lib/libpmc/Makefile
  user/attilio/vmcontention/lib/libprocstat/Symbol.map
  user/attilio/vmcontention/lib/libprocstat/core.c
  user/attilio/vmcontention/lib/libprocstat/libprocstat.3
  user/attilio/vmcontention/lib/libprocstat/libprocstat.c
  user/attilio/vmcontention/lib/libprocstat/libprocstat.h
  user/attilio/vmcontention/lib/libstand/Makefile
  user/attilio/vmcontention/lib/libstand/mips/_setjmp.S
  user/attilio/vmcontention/lib/libthr/pthread.map
  user/attilio/vmcontention/lib/libthr/thread/thr_sig.c
  user/attilio/vmcontention/lib/libthr/thread/thr_syscalls.c
  user/attilio/vmcontention/lib/libthr/thread/thr_umtx.h
  user/attilio/vmcontention/lib/libusb/Makefile
  user/attilio/vmcontention/lib/libusb/libusb20.3
  user/attilio/vmcontention/lib/libusb/libusb20.c
  user/attilio/vmcontention/lib/libusb/libusb20.h
  user/attilio/vmcontention/lib/libusb/libusb20_int.h
  user/attilio/vmcontention/lib/libusb/libusb20_ugen20.c
  user/attilio/vmcontention/lib/libvmmapi/vmmapi.c
  user/attilio/vmcontention/lib/libvmmapi/vmmapi.h
  user/attilio/vmcontention/lib/libz/ChangeLog
  user/attilio/vmcontention/lib/libz/README
  user/attilio/vmcontention/lib/libz/Symbol.map
  user/attilio/vmcontention/lib/libz/Versions.def
  user/attilio/vmcontention/lib/libz/compress.c
  user/attilio/vmcontention/lib/libz/contrib/README.contrib
  user/attilio/vmcontention/lib/libz/deflate.c
  user/attilio/vmcontention/lib/libz/deflate.h
  user/attilio/vmcontention/lib/libz/gzguts.h
  user/attilio/vmcontention/lib/libz/gzlib.c
  user/attilio/vmcontention/lib/libz/gzread.c
  user/attilio/vmcontention/lib/libz/gzwrite.c
  user/attilio/vmcontention/lib/libz/infback.c
  user/attilio/vmcontention/lib/libz/inffast.c
  user/attilio/vmcontention/lib/libz/inflate.c
  user/attilio/vmcontention/lib/libz/inftrees.c
  user/attilio/vmcontention/lib/libz/test/example.c
  user/attilio/vmcontention/lib/libz/test/minigzip.c
  user/attilio/vmcontention/lib/libz/trees.c
  user/attilio/vmcontention/lib/libz/uncompr.c
  user/attilio/vmcontention/lib/libz/zconf.h
  user/attilio/vmcontention/lib/libz/zlib.3
  user/attilio/vmcontention/lib/libz/zlib.h
  user/attilio/vmcontention/lib/libz/zutil.c
  user/attilio/vmcontention/lib/libz/zutil.h
  user/attilio/vmcontention/lib/msun/Makefile
  user/attilio/vmcontention/libexec/rtld-elf/rtld.c
  user/attilio/vmcontention/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/attilio/vmcontention/release/picobsd/floppy.tree/etc/master.passwd
  user/attilio/vmcontention/sbin/camcontrol/camcontrol.8
  user/attilio/vmcontention/sbin/camcontrol/camcontrol.c
  user/attilio/vmcontention/sbin/devd/devd.cc
  user/attilio/vmcontention/sbin/devd/devd.h
  user/attilio/vmcontention/sbin/devd/token.l
  user/attilio/vmcontention/sbin/devfs/devfs.8
  user/attilio/vmcontention/sbin/dhclient/packet.c
  user/attilio/vmcontention/sbin/dumpon/dumpon.8
  user/attilio/vmcontention/sbin/etherswitchcfg/etherswitchcfg.8
  user/attilio/vmcontention/sbin/etherswitchcfg/etherswitchcfg.c
  user/attilio/vmcontention/sbin/fsck_ffs/fsck.h
  user/attilio/vmcontention/sbin/fsck_ffs/fsck_ffs.8
  user/attilio/vmcontention/sbin/fsck_ffs/fsutil.c
  user/attilio/vmcontention/sbin/fsck_ffs/main.c
  user/attilio/vmcontention/sbin/fsck_ffs/pass5.c
  user/attilio/vmcontention/sbin/geom/class/label/glabel.8
  user/attilio/vmcontention/sbin/hastctl/hastctl.c
  user/attilio/vmcontention/sbin/hastd/primary.c
  user/attilio/vmcontention/sbin/hastd/refcnt.h
  user/attilio/vmcontention/sbin/ifconfig/iflagg.c
  user/attilio/vmcontention/sbin/mount/mount.8
  user/attilio/vmcontention/sbin/mount/mount.c
  user/attilio/vmcontention/sbin/newfs_nandfs/newfs_nandfs.c
  user/attilio/vmcontention/sbin/ping6/ping6.8
  user/attilio/vmcontention/sbin/ping6/ping6.c
  user/attilio/vmcontention/sbin/tunefs/tunefs.c
  user/attilio/vmcontention/secure/Makefile.inc
  user/attilio/vmcontention/secure/lib/libcrypto/Makefile
  user/attilio/vmcontention/secure/lib/libcrypto/Makefile.inc
  user/attilio/vmcontention/share/examples/BSD_daemon/README
  user/attilio/vmcontention/share/examples/etc/make.conf
  user/attilio/vmcontention/share/man/man3/pthread_affinity_np.3
  user/attilio/vmcontention/share/man/man3/pthread_attr_affinity_np.3
  user/attilio/vmcontention/share/man/man4/Makefile
  user/attilio/vmcontention/share/man/man4/em.4
  user/attilio/vmcontention/share/man/man4/igb.4
  user/attilio/vmcontention/share/man/man4/ixgb.4
  user/attilio/vmcontention/share/man/man4/ixgbe.4
  user/attilio/vmcontention/share/man/man4/man4.arm/Makefile
  user/attilio/vmcontention/share/man/man4/man4.i386/npx.4
  user/attilio/vmcontention/share/man/man4/syscons.4
  user/attilio/vmcontention/share/man/man4/usb_quirk.4
  user/attilio/vmcontention/share/man/man5/make.conf.5
  user/attilio/vmcontention/share/man/man5/procfs.5
  user/attilio/vmcontention/share/man/man9/counter.9
  user/attilio/vmcontention/share/man/man9/ifnet.9
  user/attilio/vmcontention/share/misc/bsd-family-tree
  user/attilio/vmcontention/share/misc/committers-src.dot
  user/attilio/vmcontention/share/misc/iso639
  user/attilio/vmcontention/share/mk/bsd.own.mk
  user/attilio/vmcontention/share/mk/bsd.progs.mk
  user/attilio/vmcontention/share/syscons/keymaps/us.dvorakp.kbd
  user/attilio/vmcontention/sys/amd64/amd64/fpu.c
  user/attilio/vmcontention/sys/amd64/conf/NOTES
  user/attilio/vmcontention/sys/amd64/include/vmm.h   (contents, props changed)
  user/attilio/vmcontention/sys/amd64/vmm/intel/vmcs.c
  user/attilio/vmcontention/sys/amd64/vmm/intel/vmcs.h
  user/attilio/vmcontention/sys/amd64/vmm/intel/vmx.c
  user/attilio/vmcontention/sys/amd64/vmm/vmm.c
  user/attilio/vmcontention/sys/amd64/vmm/vmm_instruction_emul.c
  user/attilio/vmcontention/sys/arm/arm/cpufunc.c
  user/attilio/vmcontention/sys/arm/arm/db_trace.c
  user/attilio/vmcontention/sys/arm/arm/exception.S
  user/attilio/vmcontention/sys/arm/arm/gic.c
  user/attilio/vmcontention/sys/arm/arm/identcpu.c
  user/attilio/vmcontention/sys/arm/arm/locore.S
  user/attilio/vmcontention/sys/arm/arm/swtch.S
  user/attilio/vmcontention/sys/arm/arm/trap.c
  user/attilio/vmcontention/sys/arm/broadcom/bcm2835/bcm2835_dma.c
  user/attilio/vmcontention/sys/arm/include/armreg.h
  user/attilio/vmcontention/sys/boot/common/module.c
  user/attilio/vmcontention/sys/boot/fdt/dts/beaglebone.dts
  user/attilio/vmcontention/sys/boot/i386/btx/btx/btx.S
  user/attilio/vmcontention/sys/boot/pc98/btx/btx/btx.S
  user/attilio/vmcontention/sys/cam/ata/ata_da.c
  user/attilio/vmcontention/sys/cam/cam_periph.c
  user/attilio/vmcontention/sys/cam/ctl/ctl_frontend_internal.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_all.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_all.h
  user/attilio/vmcontention/sys/cam/scsi/scsi_da.c
  user/attilio/vmcontention/sys/cam/scsi/scsi_xpt.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_proto.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscall.h
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_syscalls.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_sysent.c
  user/attilio/vmcontention/sys/compat/freebsd32/freebsd32_systrace_args.c
  user/attilio/vmcontention/sys/compat/freebsd32/syscalls.master
  user/attilio/vmcontention/sys/conf/NOTES
  user/attilio/vmcontention/sys/conf/files
  user/attilio/vmcontention/sys/conf/files.amd64
  user/attilio/vmcontention/sys/conf/files.powerpc
  user/attilio/vmcontention/sys/conf/kern.pre.mk
  user/attilio/vmcontention/sys/conf/options
  user/attilio/vmcontention/sys/conf/options.mips
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.c
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-mgmt-port.h
  user/attilio/vmcontention/sys/contrib/octeon-sdk/cvmx-usbd.c
  user/attilio/vmcontention/sys/dev/acpi_support/acpi_hp.c
  user/attilio/vmcontention/sys/dev/acpi_support/acpi_toshiba.c
  user/attilio/vmcontention/sys/dev/acpica/acpi.c
  user/attilio/vmcontention/sys/dev/acpica/acpi_pci_link.c
  user/attilio/vmcontention/sys/dev/ahci/ahci.c
  user/attilio/vmcontention/sys/dev/altera/jtag_uart/altera_jtag_uart.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah.c
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ah_devid.h
  user/attilio/vmcontention/sys/dev/ath/ath_hal/ar9003/ar9300_devid.h
  user/attilio/vmcontention/sys/dev/ath/if_ath.c
  user/attilio/vmcontention/sys/dev/ath/if_ath_tx.c
  user/attilio/vmcontention/sys/dev/bktr/bktr_core.c
  user/attilio/vmcontention/sys/dev/bktr/msp34xx.c
  user/attilio/vmcontention/sys/dev/cfi/cfi_bus_fdt.c
  user/attilio/vmcontention/sys/dev/cfi/cfi_core.c
  user/attilio/vmcontention/sys/dev/ciss/ciss.c
  user/attilio/vmcontention/sys/dev/cxgbe/adapter.h
  user/attilio/vmcontention/sys/dev/cxgbe/common/common.h
  user/attilio/vmcontention/sys/dev/cxgbe/common/t4_hw.c
  user/attilio/vmcontention/sys/dev/cxgbe/firmware/t4fw_interface.h
  user/attilio/vmcontention/sys/dev/cxgbe/osdep.h
  user/attilio/vmcontention/sys/dev/cxgbe/t4_main.c
  user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_cpl_io.c
  user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_ddp.c
  user/attilio/vmcontention/sys/dev/cxgbe/tom/t4_tom.h
  user/attilio/vmcontention/sys/dev/drm/mach64_dma.c
  user/attilio/vmcontention/sys/dev/e1000/README
  user/attilio/vmcontention/sys/dev/e1000/if_em.c
  user/attilio/vmcontention/sys/dev/e1000/if_igb.c
  user/attilio/vmcontention/sys/dev/e1000/if_lem.c
  user/attilio/vmcontention/sys/dev/etherswitch/arswitch/arswitch.c
  user/attilio/vmcontention/sys/dev/etherswitch/etherswitch.h
  user/attilio/vmcontention/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  user/attilio/vmcontention/sys/dev/hptiop/hptiop.c
  user/attilio/vmcontention/sys/dev/hptiop/hptiop.h
  user/attilio/vmcontention/sys/dev/hptmv/entry.c
  user/attilio/vmcontention/sys/dev/hptrr/hptrr_osm_bsd.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_core.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_intel.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_mod.c
  user/attilio/vmcontention/sys/dev/hwpmc/hwpmc_soft.c
  user/attilio/vmcontention/sys/dev/hwpmc/pmc_events.h
  user/attilio/vmcontention/sys/dev/iicbus/if_ic.c
  user/attilio/vmcontention/sys/dev/ixgb/README
  user/attilio/vmcontention/sys/dev/ixgbe/ixgbe.c
  user/attilio/vmcontention/sys/dev/lmc/if_lmc.c
  user/attilio/vmcontention/sys/dev/lmc/if_lmc.h
  user/attilio/vmcontention/sys/dev/mmc/mmc.c
  user/attilio/vmcontention/sys/dev/mps/mps_mapping.c
  user/attilio/vmcontention/sys/dev/mpt/mpt_pci.c
  user/attilio/vmcontention/sys/dev/netmap/if_em_netmap.h
  user/attilio/vmcontention/sys/dev/netmap/if_igb_netmap.h
  user/attilio/vmcontention/sys/dev/netmap/if_lem_netmap.h
  user/attilio/vmcontention/sys/dev/netmap/if_re_netmap.h
  user/attilio/vmcontention/sys/dev/netmap/ixgbe_netmap.h
  user/attilio/vmcontention/sys/dev/netmap/netmap.c
  user/attilio/vmcontention/sys/dev/netmap/netmap_kern.h
  user/attilio/vmcontention/sys/dev/netmap/netmap_mem2.c
  user/attilio/vmcontention/sys/dev/ppbus/if_plip.c
  user/attilio/vmcontention/sys/dev/re/if_re.c
  user/attilio/vmcontention/sys/dev/sound/usb/uaudio.c
  user/attilio/vmcontention/sys/dev/uart/uart.h
  user/attilio/vmcontention/sys/dev/uart/uart_bus_fdt.c
  user/attilio/vmcontention/sys/dev/uart/uart_bus_pci.c
  user/attilio/vmcontention/sys/dev/uart/uart_subr.c
  user/attilio/vmcontention/sys/dev/usb/controller/ohci_pci.c
  user/attilio/vmcontention/sys/dev/usb/controller/usb_controller.c
  user/attilio/vmcontention/sys/dev/usb/controller/xhci.c
  user/attilio/vmcontention/sys/dev/usb/net/if_usie.c
  user/attilio/vmcontention/sys/dev/usb/net/uhso.c
  user/attilio/vmcontention/sys/dev/usb/template/usb_template.c
  user/attilio/vmcontention/sys/dev/usb/usb_debug.h
  user/attilio/vmcontention/sys/dev/usb/usb_device.c
  user/attilio/vmcontention/sys/dev/usb/usb_device.h
  user/attilio/vmcontention/sys/dev/usb/usb_dynamic.c
  user/attilio/vmcontention/sys/dev/usb/usb_freebsd.h
  user/attilio/vmcontention/sys/dev/usb/usb_freebsd_loader.h
  user/attilio/vmcontention/sys/dev/usb/usb_generic.c
  user/attilio/vmcontention/sys/dev/usb/usb_hub.c
  user/attilio/vmcontention/sys/dev/usb/usb_hub.h
  user/attilio/vmcontention/sys/dev/usb/usb_ioctl.h
  user/attilio/vmcontention/sys/dev/usb/usb_parse.c
  user/attilio/vmcontention/sys/dev/usb/usb_process.h
  user/attilio/vmcontention/sys/dev/usb/usb_request.c
  user/attilio/vmcontention/sys/dev/usb/usb_request.h
  user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_denode.c
  user/attilio/vmcontention/sys/fs/msdosfs/msdosfs_vnops.c
  user/attilio/vmcontention/sys/fs/nfsserver/nfs_nfsdport.c
  user/attilio/vmcontention/sys/fs/smbfs/smbfs.h
  user/attilio/vmcontention/sys/fs/smbfs/smbfs_io.c
  user/attilio/vmcontention/sys/fs/smbfs/smbfs_vfsops.c
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs.h
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_subr.c
  user/attilio/vmcontention/sys/fs/tmpfs/tmpfs_vnops.c
  user/attilio/vmcontention/sys/geom/geom_dev.c
  user/attilio/vmcontention/sys/geom/geom_disk.c
  user/attilio/vmcontention/sys/geom/geom_disk.h
  user/attilio/vmcontention/sys/geom/label/g_label_ntfs.c
  user/attilio/vmcontention/sys/geom/raid/g_raid.c
  user/attilio/vmcontention/sys/i386/include/param.h
  user/attilio/vmcontention/sys/kern/capabilities.conf
  user/attilio/vmcontention/sys/kern/imgact_elf.c
  user/attilio/vmcontention/sys/kern/init_sysent.c
  user/attilio/vmcontention/sys/kern/kern_descrip.c
  user/attilio/vmcontention/sys/kern/kern_mbuf.c
  user/attilio/vmcontention/sys/kern/sys_pipe.c
  user/attilio/vmcontention/sys/kern/syscalls.c
  user/attilio/vmcontention/sys/kern/syscalls.master
  user/attilio/vmcontention/sys/kern/systrace_args.c
  user/attilio/vmcontention/sys/kern/uipc_sem.c
  user/attilio/vmcontention/sys/kern/uipc_socket.c
  user/attilio/vmcontention/sys/kern/uipc_syscalls.c
  user/attilio/vmcontention/sys/kern/vfs_subr.c
  user/attilio/vmcontention/sys/kern/vfs_vnops.c
  user/attilio/vmcontention/sys/kgssapi/krb5/krb5_mech.c
  user/attilio/vmcontention/sys/mips/atheros/ar71xx_gpio.c
  user/attilio/vmcontention/sys/mips/cavium/octe/ethernet-common.c
  user/attilio/vmcontention/sys/mips/cavium/octe/wrapper-cvmx-includes.h
  user/attilio/vmcontention/sys/mips/cavium/uart_dev_oct16550.c
  user/attilio/vmcontention/sys/mips/include/asm.h
  user/attilio/vmcontention/sys/mips/include/cpufunc.h
  user/attilio/vmcontention/sys/mips/include/frame.h
  user/attilio/vmcontention/sys/mips/include/pcb.h
  user/attilio/vmcontention/sys/mips/include/regdef.h
  user/attilio/vmcontention/sys/mips/include/regnum.h
  user/attilio/vmcontention/sys/mips/mips/bus_space_generic.c
  user/attilio/vmcontention/sys/mips/mips/db_interface.c
  user/attilio/vmcontention/sys/mips/mips/db_trace.c
  user/attilio/vmcontention/sys/mips/mips/support.S
  user/attilio/vmcontention/sys/mips/mips/swtch.S
  user/attilio/vmcontention/sys/mips/mips/trap.c
  user/attilio/vmcontention/sys/mips/mips/vm_machdep.c
  user/attilio/vmcontention/sys/modules/Makefile
  user/attilio/vmcontention/sys/modules/ath/Makefile
  user/attilio/vmcontention/sys/modules/uart/Makefile
  user/attilio/vmcontention/sys/net/ethernet.h
  user/attilio/vmcontention/sys/net/if.c
  user/attilio/vmcontention/sys/net/if_arc.h
  user/attilio/vmcontention/sys/net/if_arcsubr.c
  user/attilio/vmcontention/sys/net/if_atm.h
  user/attilio/vmcontention/sys/net/if_atmsubr.c
  user/attilio/vmcontention/sys/net/if_dead.c
  user/attilio/vmcontention/sys/net/if_disc.c
  user/attilio/vmcontention/sys/net/if_ef.c
  user/attilio/vmcontention/sys/net/if_enc.c
  user/attilio/vmcontention/sys/net/if_ethersubr.c
  user/attilio/vmcontention/sys/net/if_faith.c
  user/attilio/vmcontention/sys/net/if_fddisubr.c
  user/attilio/vmcontention/sys/net/if_fwsubr.c
  user/attilio/vmcontention/sys/net/if_gif.c
  user/attilio/vmcontention/sys/net/if_gif.h
  user/attilio/vmcontention/sys/net/if_gre.c
  user/attilio/vmcontention/sys/net/if_iso88025subr.c
  user/attilio/vmcontention/sys/net/if_lagg.c
  user/attilio/vmcontention/sys/net/if_lagg.h
  user/attilio/vmcontention/sys/net/if_loop.c
  user/attilio/vmcontention/sys/net/if_spppsubr.c
  user/attilio/vmcontention/sys/net/if_stf.c
  user/attilio/vmcontention/sys/net/if_tun.c
  user/attilio/vmcontention/sys/net/if_var.h
  user/attilio/vmcontention/sys/net/iso88025.h
  user/attilio/vmcontention/sys/net/netmap.h
  user/attilio/vmcontention/sys/net/netmap_user.h
  user/attilio/vmcontention/sys/net80211/ieee80211.c
  user/attilio/vmcontention/sys/net80211/ieee80211_output.c
  user/attilio/vmcontention/sys/net80211/ieee80211_proto.h
  user/attilio/vmcontention/sys/net80211/ieee80211_var.h
  user/attilio/vmcontention/sys/netatalk/aarp.c
  user/attilio/vmcontention/sys/netatalk/aarp.h
  user/attilio/vmcontention/sys/netatalk/at_control.c
  user/attilio/vmcontention/sys/netatalk/at_extern.h
  user/attilio/vmcontention/sys/netgraph/ng_fec.c
  user/attilio/vmcontention/sys/netgraph/ng_iface.c
  user/attilio/vmcontention/sys/netinet/icmp6.h
  user/attilio/vmcontention/sys/netinet/if_atm.c
  user/attilio/vmcontention/sys/netinet/if_atm.h
  user/attilio/vmcontention/sys/netinet/if_ether.c
  user/attilio/vmcontention/sys/netinet/if_ether.h
  user/attilio/vmcontention/sys/netinet/in.c
  user/attilio/vmcontention/sys/netinet/in.h
  user/attilio/vmcontention/sys/netinet/ip_carp.c
  user/attilio/vmcontention/sys/netinet/ip_carp.h
  user/attilio/vmcontention/sys/netinet/ip_output.c
  user/attilio/vmcontention/sys/netinet/tcp_input.c
  user/attilio/vmcontention/sys/netinet6/in6.c
  user/attilio/vmcontention/sys/netinet6/in6_ifattach.c
  user/attilio/vmcontention/sys/netinet6/in6_ifattach.h
  user/attilio/vmcontention/sys/netinet6/in6_pcb.c
  user/attilio/vmcontention/sys/netinet6/in6_proto.c
  user/attilio/vmcontention/sys/netinet6/in6_var.h
  user/attilio/vmcontention/sys/netinet6/nd6.c
  user/attilio/vmcontention/sys/netinet6/nd6.h
  user/attilio/vmcontention/sys/netpfil/ipfw/ip_dummynet.c
  user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw2.c
  user/attilio/vmcontention/sys/netpfil/ipfw/ip_fw_log.c
  user/attilio/vmcontention/sys/netpfil/pf/if_pflog.c
  user/attilio/vmcontention/sys/netpfil/pf/if_pfsync.c
  user/attilio/vmcontention/sys/netsmb/smb_conn.c
  user/attilio/vmcontention/sys/netsmb/smb_conn.h
  user/attilio/vmcontention/sys/netsmb/smb_dev.c
  user/attilio/vmcontention/sys/netsmb/smb_dev.h
  user/attilio/vmcontention/sys/netsmb/smb_trantcp.c
  user/attilio/vmcontention/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  user/attilio/vmcontention/sys/powerpc/aim/mmu_oea.c
  user/attilio/vmcontention/sys/powerpc/wii/platform_wii.c
  user/attilio/vmcontention/sys/powerpc/wii/wii_bus.c
  user/attilio/vmcontention/sys/powerpc/wii/wii_fb.c
  user/attilio/vmcontention/sys/powerpc/wii/wii_pic.c
  user/attilio/vmcontention/sys/powerpc/wii/wii_picreg.h
  user/attilio/vmcontention/sys/sys/ata.h
  user/attilio/vmcontention/sys/sys/errno.h
  user/attilio/vmcontention/sys/sys/ksem.h
  user/attilio/vmcontention/sys/sys/param.h
  user/attilio/vmcontention/sys/sys/socket.h
  user/attilio/vmcontention/sys/sys/syscall.h
  user/attilio/vmcontention/sys/sys/syscall.mk
  user/attilio/vmcontention/sys/sys/syscallsubr.h
  user/attilio/vmcontention/sys/sys/sysproto.h
  user/attilio/vmcontention/sys/sys/user.h
  user/attilio/vmcontention/sys/vm/uma_core.c
  user/attilio/vmcontention/sys/vm/vm_mmap.c
  user/attilio/vmcontention/sys/vm/vm_object.c
  user/attilio/vmcontention/sys/vm/vm_object.h
  user/attilio/vmcontention/sys/vm/vm_phys.c
  user/attilio/vmcontention/sys/vm/vm_radix.c
  user/attilio/vmcontention/sys/vm/vnode_pager.c
  user/attilio/vmcontention/sys/xen/xenstore/xenstore.c
  user/attilio/vmcontention/tools/build/mk/OptionalObsoleteFiles.inc
  user/attilio/vmcontention/tools/build/options/WITHOUT_JAIL
  user/attilio/vmcontention/tools/build/options/WITHOUT_LEGACY_CONSOLE
  user/attilio/vmcontention/tools/regression/usr.bin/xargs/regress.sh
  user/attilio/vmcontention/tools/tools/ath/athalq/Makefile
  user/attilio/vmcontention/tools/tools/ath/athalq/ar9300_ds.c
  user/attilio/vmcontention/tools/tools/ath/athalq/main.c
  user/attilio/vmcontention/tools/tools/nanobsd/nanobsd.sh
  user/attilio/vmcontention/tools/tools/netmap/README
  user/attilio/vmcontention/tools/tools/sysbuild/sysbuild.sh
  user/attilio/vmcontention/usr.bin/Makefile
  user/attilio/vmcontention/usr.bin/ar/acplex.l
  user/attilio/vmcontention/usr.bin/biff/biff.1
  user/attilio/vmcontention/usr.bin/calendar/calendars/calendar.dutch
  user/attilio/vmcontention/usr.bin/csup/token.l
  user/attilio/vmcontention/usr.bin/fstat/fstat.1
  user/attilio/vmcontention/usr.bin/fstat/fstat.c
  user/attilio/vmcontention/usr.bin/m4/TEST/ack.m4
  user/attilio/vmcontention/usr.bin/m4/TEST/hanoi.m4
  user/attilio/vmcontention/usr.bin/m4/TEST/hash.m4
  user/attilio/vmcontention/usr.bin/m4/TEST/sqroot.m4
  user/attilio/vmcontention/usr.bin/m4/TEST/string.m4
  user/attilio/vmcontention/usr.bin/m4/TEST/test.m4
  user/attilio/vmcontention/usr.bin/m4/eval.c
  user/attilio/vmcontention/usr.bin/m4/extern.h
  user/attilio/vmcontention/usr.bin/m4/m4.1
  user/attilio/vmcontention/usr.bin/m4/main.c
  user/attilio/vmcontention/usr.bin/m4/parser.y
  user/attilio/vmcontention/usr.bin/m4/tokenizer.l
  user/attilio/vmcontention/usr.bin/nfsstat/nfsstat.1
  user/attilio/vmcontention/usr.bin/touch/touch.c
  user/attilio/vmcontention/usr.bin/xlint/lint1/scan.l
  user/attilio/vmcontention/usr.sbin/acpi/acpidb/Makefile
  user/attilio/vmcontention/usr.sbin/acpi/acpidb/acpidb.c
  user/attilio/vmcontention/usr.sbin/acpi/iasl/Makefile
  user/attilio/vmcontention/usr.sbin/apmd/apmdlex.l
  user/attilio/vmcontention/usr.sbin/bhyve/bhyverun.c
  user/attilio/vmcontention/usr.sbin/bhyve/pci_emul.c
  user/attilio/vmcontention/usr.sbin/bhyve/pci_emul.h
  user/attilio/vmcontention/usr.sbin/bhyve/pci_virtio_block.c
  user/attilio/vmcontention/usr.sbin/bhyve/pci_virtio_net.c
  user/attilio/vmcontention/usr.sbin/bhyve/virtio.h
  user/attilio/vmcontention/usr.sbin/bsdconfig/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/bsdconfig
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/console
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/font
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/keymap
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/repeat
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/saver
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/screenmap
  user/attilio/vmcontention/usr.sbin/bsdconfig/console/ttys
  user/attilio/vmcontention/usr.sbin/bsdconfig/diskmgmt/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/diskmgmt/diskmgmt
  user/attilio/vmcontention/usr.sbin/bsdconfig/docsinstall/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/docsinstall/docsinstall
  user/attilio/vmcontention/usr.sbin/bsdconfig/dot/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/dot/dot
  user/attilio/vmcontention/usr.sbin/bsdconfig/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/disable
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/enable
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/flags
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/mouse
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/port
  user/attilio/vmcontention/usr.sbin/bsdconfig/mouse/type
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/defaultrouter
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/devices
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/hostname
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/nameservers
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/networking
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/device.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/media.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/networking/share/resolv.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/password/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/password/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/password/password
  user/attilio/vmcontention/usr.sbin/bsdconfig/password/share/password.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/security/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/security/kern_securelevel
  user/attilio/vmcontention/usr.sbin/bsdconfig/security/security
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/common.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/device.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/dialog.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/media/common.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/media/ftp.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/media/options.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/media/tcpip.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/mustberoot.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/share/strings.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/misc
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcadd
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcconf
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcdelete
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcedit
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/rcvar
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcconf.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/share/rcvar.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/startup/startup
  user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/timezone/timezone
  user/attilio/vmcontention/usr.sbin/bsdconfig/ttys/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/ttys/ttys
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/USAGE
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupadd
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupdel
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupedit
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/groupinput
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/include/messages.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/useradd
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/userdel
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/useredit
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/userinput
  user/attilio/vmcontention/usr.sbin/bsdconfig/usermgmt/usermgmt
  user/attilio/vmcontention/usr.sbin/config/lang.l
  user/attilio/vmcontention/usr.sbin/config/main.c
  user/attilio/vmcontention/usr.sbin/gssd/gssd.c
  user/attilio/vmcontention/usr.sbin/jail/jaillex.l
  user/attilio/vmcontention/usr.sbin/kbdcontrol/lex.l
  user/attilio/vmcontention/usr.sbin/mergemaster/mergemaster.sh
  user/attilio/vmcontention/usr.sbin/nandsim/nandsim_cfgparse.c
  user/attilio/vmcontention/usr.sbin/ndiscvt/inf-token.l
  user/attilio/vmcontention/usr.sbin/nfsd/nfsv4.4
  user/attilio/vmcontention/usr.sbin/rrenumd/lexer.l
  user/attilio/vmcontention/usr.sbin/syslogd/syslogd.c
  user/attilio/vmcontention/usr.sbin/timed/timed/timed.8
Directory Properties:
  user/attilio/vmcontention/   (props changed)
  user/attilio/vmcontention/cddl/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/attilio/vmcontention/contrib/binutils/   (props changed)
  user/attilio/vmcontention/contrib/bmake/   (props changed)
  user/attilio/vmcontention/contrib/libc++/   (props changed)
  user/attilio/vmcontention/contrib/libcxxrt/   (props changed)
  user/attilio/vmcontention/contrib/llvm/   (props changed)
  user/attilio/vmcontention/contrib/sendmail/   (props changed)
  user/attilio/vmcontention/crypto/openssh/   (props changed)
  user/attilio/vmcontention/gnu/usr.bin/gdb/   (props changed)
  user/attilio/vmcontention/lib/libc/   (props changed)
  user/attilio/vmcontention/lib/libvmmapi/   (props changed)
  user/attilio/vmcontention/lib/libz/   (props changed)
  user/attilio/vmcontention/sbin/   (props changed)
  user/attilio/vmcontention/sbin/dumpon/   (props changed)
  user/attilio/vmcontention/share/man/man4/   (props changed)
  user/attilio/vmcontention/sys/   (props changed)
  user/attilio/vmcontention/sys/amd64/vmm/   (props changed)
  user/attilio/vmcontention/sys/boot/   (props changed)
  user/attilio/vmcontention/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/vmcontention/sys/conf/   (props changed)
  user/attilio/vmcontention/sys/contrib/octeon-sdk/   (props changed)
  user/attilio/vmcontention/usr.bin/calendar/   (props changed)
  user/attilio/vmcontention/usr.bin/csup/   (props changed)
  user/attilio/vmcontention/usr.sbin/bhyve/   (props changed)
  user/attilio/vmcontention/usr.sbin/jail/   (props changed)
  user/attilio/vmcontention/usr.sbin/ndiscvt/   (props changed)

Modified: user/attilio/vmcontention/MAINTAINERS
==============================================================================
--- user/attilio/vmcontention/MAINTAINERS	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/MAINTAINERS	Sun May  5 13:28:18 2013	(r250269)
@@ -64,7 +64,6 @@ linprocfs	des	Pre-commit review requeste
 lpr		gad	Pre-commit review requested, particularly for
 			lpd/recvjob.c and lpd/printjob.c.
 newsyslog(8)	gad	Heads-up appreciated.  I'm going thru the PR's for it.
-cvs		peter	Heads-up appreciated, try not to break it.
 nvi		peter	Try not to break it.
 libz		peter	Try not to break it.
 groff		ru	Recommends pre-commit review.

Modified: user/attilio/vmcontention/Makefile.inc1
==============================================================================
--- user/attilio/vmcontention/Makefile.inc1	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/Makefile.inc1	Sun May  5 13:28:18 2013	(r250269)
@@ -41,13 +41,6 @@
 # /usr/share/mk.  These include:
 #		obj depend all install clean cleandepend cleanobj
 
-# You are supposed to define both of these when calling Makefile.inc1
-# directly.  However, some old scripts don't.  Cope for the moment, but
-# issue a new warning for a transition period.
-.if defined(TARGET) && !defined(TARGET_ARCH)
-.warning "You must pass both TARGET and TARGET_ARCH to Makefile.inc1.  Setting TARGET_ARCH=${TARGET}."
-TARGET_ARCH=${TARGET}
-.endif
 .if !defined(TARGET) || !defined(TARGET_ARCH)
 .error "Both TARGET and TARGET_ARCH must be defined."
 .endif
@@ -65,6 +58,9 @@ TARGET_ARCH=${TARGET}
 # use that new version.  And the new (dynamically-linked) /bin/sh
 # will expect to find appropriate libraries in /lib and /libexec.
 #
+.if defined(SUBDIR_OVERRIDE)
+SUBDIR=	${SUBDIR_OVERRIDE}
+.else
 SUBDIR=	share/info lib libexec
 SUBDIR+=bin
 .if ${MK_GAMES} != "no"
@@ -103,9 +99,6 @@ SUBDIR+=etc
 SUBDIR+= ${_DIR}
 .endif
 .endfor
-
-.if defined(SUBDIR_OVERRIDE)
-SUBDIR=		${SUBDIR_OVERRIDE}
 .endif
 
 .if defined(NOCLEAN)
@@ -616,6 +609,7 @@ kernel-toolchain: ${TOOLCHAIN_TGTS:N_inc
 # Checks to be sure system is ready for installworld/installkernel.
 #
 installcheck:
+installcheck_UGID:
 
 #
 # Require DESTDIR to be set if installing for a different architecture or
@@ -647,7 +641,6 @@ CHECK_GIDS+=	smmsp
 CHECK_UIDS+=	proxy
 CHECK_GIDS+=	proxy authpf
 .endif
-installcheck: installcheck_UGID
 installcheck_UGID:
 .for uid in ${CHECK_UIDS}
 	@if ! `id -u ${uid} >/dev/null 2>&1`; then \
@@ -703,7 +696,7 @@ EXTRA_DISTRIBUTIONS+=	lib32
 
 MTREE_MAGIC?=	mtree 2.0
 
-distributeworld installworld: installcheck
+distributeworld installworld: installcheck installcheck_UGID
 	mkdir -p ${INSTALLTMP}
 	progs=$$(for prog in ${ITOOLS}; do \
 		if progpath=`which $$prog`; then \

Modified: user/attilio/vmcontention/UPDATING
==============================================================================
--- user/attilio/vmcontention/UPDATING	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/UPDATING	Sun May  5 13:28:18 2013	(r250269)
@@ -12,9 +12,9 @@ Items affecting the ports and packages s
 /usr/ports/UPDATING.  Please read that file before running portupgrade.
 
 NOTE: FreeBSD has switched from gcc to clang. If you have trouble bootstrapping
-from older versions of FreeBSD, try WITHOUT_CLANG and WITHOUT_CLANG_IS_CC to
-bootstrap to tip of head, and then rebuild without those options. The bootstrap
-process from older version of current is a bit fragile.
+from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
+head, and then rebuild without this option. The bootstrap process from
+older version of current is a bit fragile.
 
 NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
 	FreeBSD 10.x has many debugging features turned on, in both the kernel
@@ -31,6 +31,28 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130429:
+        Fix a bug that allows NFS clients to issue READDIR on files.
+
+20130426:
+	The WITHOUT_IDEA option has been removed because
+	the IDEA patent expired.
+
+20130426:
+	The sysctl which controls TRIM support under ZFS has been renamed
+	from vfs.zfs.trim_disable -> vfs.zfs.trim.enabled and has been
+	enabled by default.
+
+20130425:
+	The mergemaster command now uses the default MAKEOBJDIRPREFIX
+	rather than creating it's own in the temporary directory in
+	order allow access to bootstrapped versions of tools such as
+	install and mtree.  When upgrading from version of FreeBSD where
+	the install command does not support -l, you will need to
+	install a new mergemaster command if mergemaster -p is required.
+	This can be accomplished with the command (cd src/usr.sbin/mergemaster
+	&& make install).
+
 20130404:
 	Legacy ATA stack, disabled and replaced by new CAM-based one since
 	FreeBSD 9.0, completely removed from the sources.  Kernel modules
@@ -82,6 +104,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	while having the GNU version installed as gnupatch, rebuild
 	and install world with the WITH_BSD_PATCH knob set.
 
+20130121:
+	Due to the use of the new -l option to install(1) during build
+	and install, you must take care not to directly set the INSTALL
+	make variable in your /etc/make.conf, /etc/src.conf, or on the
+	command line.  If you with to use the -C flag for all installs
+	you may be able to add INSTALL+=-C to /etc/make.conf or
+	/etc/src.conf.
+
 20130118:
 	The install(1) option -M has changed meaning and now takes an
 	argument that is a file or path to append logs to.  In the
@@ -127,7 +157,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	This means that the world and kernel will be compiled with clang
 	and that clang will be installed as /usr/bin/cc, /usr/bin/c++,
 	and /usr/bin/cpp.  To disable this behavior and revert to building
-	with gcc, compile with WITHOUT_CLANG_IS_CC.
+	with gcc, compile with WITHOUT_CLANG_IS_CC. Really old versions
+	of current may need to bootstrap WITHOUT_CLANG first if the clang
+	build fails (its compatibility window doesn't extend to the 9 stable
+	branch point).
 
 20121102:
 	The IPFIREWALL_FORWARD kernel option has been removed. Its
@@ -258,7 +291,9 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	is now spelled mips64.  mipsn32eb is now spelled mipsn32.  mipseb is
 	now spelled mips.  This is to aid compatibility with third-party
 	software that expects this naming scheme in uname(3).  Little-endian
-	settings are unchanged.
+	settings are unchanged. If you are updating a big-endian mips64 machine
+	from before this change, you may need to set MACHINE_ARCH=mips64 in
+	your environment before the new build system will recognize your machine.
 
 20120306:
 	Disable by default the option VFS_ALLOW_NONMPSAFE for all supported
@@ -1609,6 +1644,11 @@ COMMON ITEMS:
 	path, and has the highest probability of being successful.  Please try
 	this approach before reporting problems with a major version upgrade.
 
+	When upgrading a live system, having a root shell around before
+	installing anything can help undo problems. Not having a root shell
+	around can lead to problems if pam has changed too much from your
+	starting point to allow continued authentication after the upgrade.
+
 	ZFS notes
 	---------
 	When upgrading the boot ZFS pool to a new version, always follow
@@ -1674,7 +1714,6 @@ COMMON ITEMS:
 	make delete-old					[6]
 	<reboot>
 
-
 	To cross-install current onto a separate partition
 	--------------------------------------------------
 	# In this approach we use a separate partition to hold
@@ -1750,7 +1789,7 @@ COMMON ITEMS:
 	step.  It never hurts to do it all the time.  You may need to
 	install a new mergemaster (cd src/usr.sbin/mergemaster && make
 	install) after the buildworld before this step if you last updated
-	from current before 20020224 or from -stable before 20020408.
+	from current before 20130425 or from -stable before 20130430.
 
 	[6] This only deletes old files and directories. Old libraries
 	can be deleted by "make delete-old-libs", but you have to make

Modified: user/attilio/vmcontention/bin/cat/cat.c
==============================================================================
--- user/attilio/vmcontention/bin/cat/cat.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/cat/cat.c	Sun May  5 13:28:18 2013	(r250269)
@@ -68,7 +68,7 @@ static int bflag, eflag, lflag, nflag, s
 static int rval;
 static const char *filename;
 
-static void usage(void);
+static void usage(void) __dead2;
 static void scanfiles(char *argv[], int cooked);
 static void cook_cat(FILE *);
 static void raw_cat(int);
@@ -153,6 +153,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
+
 	fprintf(stderr, "usage: cat [-belnstuv] [file ...]\n");
 	exit(1);
 	/* NOTREACHED */

Modified: user/attilio/vmcontention/bin/dd/dd.c
==============================================================================
--- user/attilio/vmcontention/bin/dd/dd.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/dd/dd.c	Sun May  5 13:28:18 2013	(r250269)
@@ -358,7 +358,7 @@ dd_in(void)
 		 * than noerror, notrunc or sync are specified, the block
 		 * is output without buffering as it is read.
 		 */
-		if (ddflags & C_BS) {
+		if ((ddflags & ~(C_NOERROR | C_NOTRUNC | C_SYNC)) == C_BS) {
 			out.dbcnt = in.dbcnt;
 			dd_out(1);
 			in.dbcnt = 0;

Modified: user/attilio/vmcontention/bin/df/df.c
==============================================================================
--- user/attilio/vmcontention/bin/df/df.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/df/df.c	Sun May  5 13:28:18 2013	(r250269)
@@ -296,7 +296,6 @@ main(int argc, char *argv[])
 			prtstat(&mntbuf[i], &maxwidths);
 	if (cflag)
 		prtstat(&totalbuf, &maxwidths);
-	free(mntbuf);
 	return (rv);
 }
 

Modified: user/attilio/vmcontention/bin/domainname/domainname.1
==============================================================================
--- user/attilio/vmcontention/bin/domainname/domainname.1	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/domainname/domainname.1	Sun May  5 13:28:18 2013	(r250269)
@@ -29,7 +29,7 @@
 .\"	From: @(#)hostname.1	8.1 (Berkeley) 5/31/93
 .\" $FreeBSD$
 .\"
-.Dd September 18, 1994
+.Dd April 22, 2013
 .Dt DOMAINNAME 1
 .Os
 .Sh NAME
@@ -43,10 +43,11 @@ The
 .Nm
 utility prints the name of the current YP/NIS domain.
 The super-user can
-set the domain name by supplying an argument; this is usually done in the
-network initialization script
-.Pa /etc/rc.network ,
-normally run at boot
+set the domain name by supplying an argument; this is usually done with the
+.Va nisdomainname
+variable in the
+.Pa /etc/rc.conf
+file, normally run at boot
 time.
 .Sh NOTES
 The YP/NIS (formerly ``Yellow Pages'' but renamed for legal reasons)
@@ -54,7 +55,8 @@ domain name does not necessarily have an
 Name System domain name, although they are often set equal for administrative
 convenience.
 .Sh SEE ALSO
-.Xr getdomainname 3
+.Xr getdomainname 3 ,
+.Xr rc.conf 5
 .Sh HISTORY
 The
 .Nm

Modified: user/attilio/vmcontention/bin/hostname/hostname.c
==============================================================================
--- user/attilio/vmcontention/bin/hostname/hostname.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/hostname/hostname.c	Sun May  5 13:28:18 2013	(r250269)
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-static void usage(void);
+static void usage(void) __dead2;
 
 int
 main(int argc, char *argv[])

Modified: user/attilio/vmcontention/bin/kill/kill.c
==============================================================================
--- user/attilio/vmcontention/bin/kill/kill.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/kill/kill.c	Sun May  5 13:28:18 2013	(r250269)
@@ -156,7 +156,7 @@ signame_to_signum(const char *sig)
 {
 	int n;
 
-	if (!strncasecmp(sig, "SIG", (size_t)3))
+	if (strncasecmp(sig, "SIG", 3) == 0)
 		sig += 3;
 	for (n = 1; n < sys_nsig; n++) {
 		if (!strcasecmp(sys_signame[n], sig))

Modified: user/attilio/vmcontention/bin/mkdir/mkdir.c
==============================================================================
--- user/attilio/vmcontention/bin/mkdir/mkdir.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/mkdir/mkdir.c	Sun May  5 13:28:18 2013	(r250269)
@@ -135,7 +135,7 @@ main(int argc, char *argv[])
  * Returns 1 if a directory has been created,
  * 2 if it already existed, and 0 on failure.
  */
-int
+static int
 build(char *path, mode_t omode)
 {
 	struct stat sb;
@@ -208,7 +208,7 @@ build(char *path, mode_t omode)
 	return (retval);
 }
 
-void
+static void
 usage(void)
 {
 

Modified: user/attilio/vmcontention/bin/rm/rm.1
==============================================================================
--- user/attilio/vmcontention/bin/rm/rm.1	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/rm/rm.1	Sun May  5 13:28:18 2013	(r250269)
@@ -32,7 +32,7 @@
 .\"	@(#)rm.1	8.5 (Berkeley) 12/5/94
 .\" $FreeBSD$
 .\"
-.Dd March 15, 2013
+.Dd April 25, 2013
 .Dt RM 1
 .Os
 .Sh NAME
@@ -42,7 +42,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl f | i
-.Op Fl dIPRrvW
+.Op Fl dIPRrvWx
 .Ar
 .Nm unlink
 .Ar file
@@ -132,6 +132,8 @@ Attempt to undelete the named files.
 Currently, this option can only be used to recover
 files covered by whiteouts in a union file system (see
 .Xr undelete 2 ) .
+.It Fl x
+When removing a hierarchy, do not cross mount points.
 .El
 .Pp
 The

Modified: user/attilio/vmcontention/bin/rm/rm.c
==============================================================================
--- user/attilio/vmcontention/bin/rm/rm.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/rm/rm.c	Sun May  5 13:28:18 2013	(r250269)
@@ -59,19 +59,19 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 
 static int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
-static int rflag, Iflag;
+static int rflag, Iflag, xflag;
 static uid_t uid;
 static volatile sig_atomic_t info;
 
-int	check(char *, char *, struct stat *);
-int	check2(char **);
-void	checkdot(char **);
-void	checkslash(char **);
-void	rm_file(char **);
-int	rm_overwrite(char *, struct stat *);
-void	rm_tree(char **);
+static int	check(const char *, const char *, struct stat *);
+static int	check2(char **);
+static void	checkdot(char **);
+static void	checkslash(char **);
+static void	rm_file(char **);
+static int	rm_overwrite(const char *, struct stat *);
+static void	rm_tree(char **);
 static void siginfo(int __unused);
-void	usage(void);
+static void	usage(void);
 
 /*
  * rm --
@@ -106,8 +106,8 @@ main(int argc, char *argv[])
 		exit(eval);
 	}
 
-	Pflag = rflag = 0;
-	while ((ch = getopt(argc, argv, "dfiIPRrvW")) != -1)
+	Pflag = rflag = xflag = 0;
+	while ((ch = getopt(argc, argv, "dfiIPRrvWx")) != -1)
 		switch(ch) {
 		case 'd':
 			dflag = 1;
@@ -136,6 +136,9 @@ main(int argc, char *argv[])
 		case 'W':
 			Wflag = 1;
 			break;
+		case 'x':
+			xflag = 1;
+			break;
 		default:
 			usage();
 		}
@@ -170,7 +173,7 @@ main(int argc, char *argv[])
 	exit (eval);
 }
 
-void
+static void
 rm_tree(char **argv)
 {
 	FTS *fts;
@@ -196,6 +199,8 @@ rm_tree(char **argv)
 		flags |= FTS_NOSTAT;
 	if (Wflag)
 		flags |= FTS_WHITEOUT;
+	if (xflag)
+		flags |= FTS_XDEV;
 	if (!(fts = fts_open(argv, flags, NULL))) {
 		if (fflag && errno == ENOENT)
 			return;
@@ -335,7 +340,7 @@ err:
 	fts_close(fts);
 }
 
-void
+static void
 rm_file(char **argv)
 {
 	struct stat sb;
@@ -412,8 +417,8 @@ rm_file(char **argv)
  * System V file system).  In a logging or COW file system, you'll have to
  * have kernel support.
  */
-int
-rm_overwrite(char *file, struct stat *sbp)
+static int
+rm_overwrite(const char *file, struct stat *sbp)
 {
 	struct stat sb, sb2;
 	struct statfs fsb;
@@ -479,8 +484,8 @@ err:	eval = 1;
 }
 
 
-int
-check(char *path, char *name, struct stat *sp)
+static int
+check(const char *path, const char *name, struct stat *sp)
 {
 	int ch, first;
 	char modep[15], *flagsp;
@@ -491,7 +496,7 @@ check(char *path, char *name, struct sta
 	else {
 		/*
 		 * If it's not a symbolic link and it's unwritable and we're
-		 * talking to a terminal, ask.	Symbolic links are excluded
+		 * talking to a terminal, ask.  Symbolic links are excluded
 		 * because their permissions are meaningless.  Check stdin_ok
 		 * first because we may not have stat'ed the file.
 		 */
@@ -524,7 +529,7 @@ check(char *path, char *name, struct sta
 }
 
 #define ISSLASH(a)	((a)[0] == '/' && (a)[1] == '\0')
-void
+static void
 checkslash(char **argv)
 {
 	char **t, **u;
@@ -544,7 +549,7 @@ checkslash(char **argv)
 	}
 }
 
-int
+static int
 check2(char **argv)
 {
 	struct stat st;
@@ -595,7 +600,7 @@ check2(char **argv)
 }
 
 #define ISDOT(a)	((a)[0] == '.' && (!(a)[1] || ((a)[1] == '.' && !(a)[2])))
-void
+static void
 checkdot(char **argv)
 {
 	char *p, **save, **t;
@@ -619,12 +624,12 @@ checkdot(char **argv)
 	}
 }
 
-void
+static void
 usage(void)
 {
 
 	(void)fprintf(stderr, "%s\n%s\n",
-	    "usage: rm [-f | -i] [-dIPRrvW] file ...",
+	    "usage: rm [-f | -i] [-dIPRrvWx] file ...",
 	    "       unlink file");
 	exit(EX_USAGE);
 }

Modified: user/attilio/vmcontention/bin/sh/input.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/input.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/input.c	Sun May  5 13:28:18 2013	(r250269)
@@ -397,10 +397,10 @@ setinputfile(const char *fname, int push
 	int fd2;
 
 	INTOFF;
-	if ((fd = open(fname, O_RDONLY)) < 0)
+	if ((fd = open(fname, O_RDONLY | O_CLOEXEC)) < 0)
 		error("cannot open %s: %s", fname, strerror(errno));
 	if (fd < 10) {
-		fd2 = fcntl(fd, F_DUPFD, 10);
+		fd2 = fcntl(fd, F_DUPFD_CLOEXEC, 10);
 		close(fd);
 		if (fd2 < 0)
 			error("Out of file descriptors");
@@ -412,14 +412,13 @@ setinputfile(const char *fname, int push
 
 
 /*
- * Like setinputfile, but takes an open file descriptor.  Call this with
- * interrupts off.
+ * Like setinputfile, but takes an open file descriptor (which should have
+ * its FD_CLOEXEC flag already set).  Call this with interrupts off.
  */
 
 void
 setinputfd(int fd, int push)
 {
-	(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
 	if (push) {
 		pushfile();
 		parsefile->buf = ckmalloc(BUFSIZ + 1);

Modified: user/attilio/vmcontention/bin/sh/jobs.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/jobs.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/jobs.c	Sun May  5 13:28:18 2013	(r250269)
@@ -127,11 +127,12 @@ setjobctl(int on)
 	if (on) {
 		if (ttyfd != -1)
 			close(ttyfd);
-		if ((ttyfd = open(_PATH_TTY, O_RDWR)) < 0) {
+		if ((ttyfd = open(_PATH_TTY, O_RDWR | O_CLOEXEC)) < 0) {
 			i = 0;
 			while (i <= 2 && !isatty(i))
 				i++;
-			if (i > 2 || (ttyfd = fcntl(i, F_DUPFD, 10)) < 0)
+			if (i > 2 ||
+			    (ttyfd = fcntl(i, F_DUPFD_CLOEXEC, 10)) < 0)
 				goto out;
 		}
 		if (ttyfd < 10) {
@@ -139,7 +140,7 @@ setjobctl(int on)
 			 * Keep our TTY file descriptor out of the way of
 			 * the user's redirections.
 			 */
-			if ((i = fcntl(ttyfd, F_DUPFD, 10)) < 0) {
+			if ((i = fcntl(ttyfd, F_DUPFD_CLOEXEC, 10)) < 0) {
 				close(ttyfd);
 				ttyfd = -1;
 				goto out;
@@ -147,11 +148,6 @@ setjobctl(int on)
 			close(ttyfd);
 			ttyfd = i;
 		}
-		if (fcntl(ttyfd, F_SETFD, FD_CLOEXEC) < 0) {
-			close(ttyfd);
-			ttyfd = -1;
-			goto out;
-		}
 		do { /* while we are in the background */
 			initialpgrp = tcgetpgrp(ttyfd);
 			if (initialpgrp < 0) {
@@ -417,13 +413,15 @@ showjobs(int change, int mode)
 		if (change && ! jp->changed)
 			continue;
 		showjob(jp, mode);
-		jp->changed = 0;
-		/* Hack: discard jobs for which $! has not been referenced
-		 * in interactive mode when they terminate.
-		 */
-		if (jp->state == JOBDONE && !jp->remembered &&
-				(iflag || jp != bgjob)) {
-			freejob(jp);
+		if (mode == SHOWJOBS_DEFAULT || mode == SHOWJOBS_VERBOSE) {
+			jp->changed = 0;
+			/* Hack: discard jobs for which $! has not been
+			 * referenced in interactive mode when they terminate.
+			 */
+			if (jp->state == JOBDONE && !jp->remembered &&
+					(iflag || jp != bgjob)) {
+				freejob(jp);
+			}
 		}
 	}
 }

Modified: user/attilio/vmcontention/bin/sh/main.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/main.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/main.c	Sun May  5 13:28:18 2013	(r250269)
@@ -248,7 +248,7 @@ read_profile(const char *name)
 	if (expandedname == NULL)
 		return;
 	INTOFF;
-	if ((fd = open(expandedname, O_RDONLY)) >= 0)
+	if ((fd = open(expandedname, O_RDONLY | O_CLOEXEC)) >= 0)
 		setinputfd(fd, 1);
 	INTON;
 	if (fd < 0)

Modified: user/attilio/vmcontention/bin/sh/miscbltin.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/miscbltin.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/miscbltin.c	Sun May  5 13:28:18 2013	(r250269)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include "error.h"
 #include "mystring.h"
 #include "syntax.h"
+#include "trap.h"
 
 #undef eflag
 
@@ -102,6 +103,8 @@ readcmd(int argc __unused, char **argv _
 	struct timeval tv;
 	char *tvptr;
 	fd_set ifds;
+	ssize_t nread;
+	int sig;
 
 	rflag = 0;
 	prompt = NULL;
@@ -156,8 +159,10 @@ readcmd(int argc __unused, char **argv _
 		/*
 		 * If there's nothing ready, return an error.
 		 */
-		if (status <= 0)
-			return(1);
+		if (status <= 0) {
+			sig = pendingsig;
+			return (128 + (sig != 0 ? sig : SIGALRM));
+		}
 	}
 
 	status = 0;
@@ -165,7 +170,19 @@ readcmd(int argc __unused, char **argv _
 	backslash = 0;
 	STARTSTACKSTR(p);
 	for (;;) {
-		if (read(STDIN_FILENO, &c, 1) != 1) {
+		nread = read(STDIN_FILENO, &c, 1);
+		if (nread == -1) {
+			if (errno == EINTR) {
+				sig = pendingsig;
+				if (sig == 0)
+					continue;
+				status = 128 + sig;
+				break;
+			}
+			warning("read error: %s", strerror(errno));
+			status = 2;
+			break;
+		} else if (nread != 1) {
 			status = 1;
 			break;
 		}

Modified: user/attilio/vmcontention/bin/sh/redir.c
==============================================================================
--- user/attilio/vmcontention/bin/sh/redir.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/redir.c	Sun May  5 13:28:18 2013	(r250269)
@@ -121,7 +121,7 @@ redirect(union node *redir, int flags)
 
 		if ((flags & REDIR_PUSH) && sv->renamed[fd] == EMPTY) {
 			INTOFF;
-			if ((i = fcntl(fd, F_DUPFD, 10)) == -1) {
+			if ((i = fcntl(fd, F_DUPFD_CLOEXEC, 10)) == -1) {
 				switch (errno) {
 				case EBADF:
 					i = CLOSED;
@@ -131,8 +131,7 @@ redirect(union node *redir, int flags)
 					error("%d: %s", fd, strerror(errno));
 					break;
 				}
-			} else
-				(void)fcntl(i, F_SETFD, FD_CLOEXEC);
+			}
 			sv->renamed[fd] = i;
 			INTON;
 		}

Modified: user/attilio/vmcontention/bin/sh/sh.1
==============================================================================
--- user/attilio/vmcontention/bin/sh/sh.1	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/bin/sh/sh.1	Sun May  5 13:28:18 2013	(r250269)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd March 24, 2013
+.Dd May 3, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -1340,9 +1340,33 @@ The primary prompt string, which default
 .Dq Li "$ " ,
 unless you are the superuser, in which case it defaults to
 .Dq Li "# " .
+.Va PS1
+may include any of the following formatting sequences,
+which are replaced by the given information:
+.Bl -tag -width indent
+.It Li \eH
+The local hostname.
+.It Li \eh
+The fully-qualified hostname.
+.It Li \eW
+The final component of the current working directory.
+.It Li \ew
+The entire path of the current working directory.
+.It Li \e$
+Superuser status.
+.Dq Li "$ "
+for normal users and
+.Dq Li "# "
+for superusers.
+.It Li \e\e
+A literal backslash.
+.El
 .It Va PS2
 The secondary prompt string, which defaults to
 .Dq Li "> " .
+.Va PS2
+may include any of the formatting sequences from
+.Va PS1 .
 .It Va PS4
 The prefix for the trace output (if
 .Fl x
@@ -2348,7 +2372,9 @@ option is specified and the
 elapses before a complete line of input is supplied,
 the
 .Ic read
-command will return an exit status of 1 without assigning any values.
+command will return an exit status as if terminated by
+.Dv SIGALRM
+without assigning any values.
 The
 .Ar timeout
 value may optionally be followed by one of
@@ -2364,6 +2390,11 @@ is assumed.
 The
 .Fl e
 option exists only for backward compatibility with older scripts.
+.Pp
+The exit status is 0 on success, 1 on end of file,
+between 2 and 128 if an error occurs
+and greater than 128 if a trapped signal interrupts
+.Ic read .
 .It Ic readonly Oo Fl p Oc Op Ar name ...
 Each specified
 .Ar name

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c	Sun May  5 13:28:18 2013	(r250269)
@@ -1130,7 +1130,7 @@ alloc:
 #if defined(sun)
 	dtp->dt_prcmode = DT_PROC_STOP_PREINIT;
 #else
-	dtp->dt_prcmode = DT_PROC_STOP_POSTINIT;
+	dtp->dt_prcmode = DT_PROC_STOP_MAIN;
 #endif
 	dtp->dt_linkmode = DT_LINK_KERNEL;
 	dtp->dt_linktype = DT_LTYP_ELF;

Modified: user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c	Sun May  5 13:28:18 2013	(r250269)
@@ -4207,10 +4207,13 @@ zfs_hold(zfs_handle_t *zhp, const char *
 	if (nvlist_next_nvpair(ha.nvl, NULL) == NULL) {
 		fnvlist_free(ha.nvl);
 		ret = ENOENT;
-		(void) snprintf(errbuf, sizeof (errbuf),
-		    dgettext(TEXT_DOMAIN, "cannot hold snapshot '%s@%s'"),
-		    zhp->zfs_name, snapname);
-		(void) zfs_standard_error(hdl, ret, errbuf);
+		if (!enoent_ok) {
+			(void) snprintf(errbuf, sizeof (errbuf),
+			    dgettext(TEXT_DOMAIN,
+			    "cannot hold snapshot '%s@%s'"),
+			    zhp->zfs_name, snapname);
+			(void) zfs_standard_error(hdl, ret, errbuf);
+		}
 		return (ret);
 	}
 

Modified: user/attilio/vmcontention/contrib/binutils/binutils/arlex.l
==============================================================================
--- user/attilio/vmcontention/contrib/binutils/binutils/arlex.l	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/contrib/binutils/binutils/arlex.l	Sun May  5 13:28:18 2013	(r250269)
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street - F
 #include "libiberty.h"
 #include "arparse.h"
 
-#define YY_NO_UNPUT
-
 extern int yylex (void);
 
 int linenumber;
 %}
 
+%option nounput
+
 %a 10000
 %o 25000
 

Modified: user/attilio/vmcontention/contrib/binutils/ld/ldlex.l
==============================================================================
--- user/attilio/vmcontention/contrib/binutils/ld/ldlex.l	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/contrib/binutils/ld/ldlex.l	Sun May  5 13:28:18 2013	(r250269)
@@ -63,8 +63,6 @@ const char *lex_string = NULL;
 #undef YY_INPUT
 #define YY_INPUT(buf,result,max_size) yy_input (buf, &result, max_size)
 
-#define YY_NO_UNPUT
-
 #define MAX_INCLUDE_DEPTH 10
 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
 static const char *file_name_stack[MAX_INCLUDE_DEPTH];
@@ -72,7 +70,7 @@ static unsigned int lineno_stack[MAX_INC
 static unsigned int include_stack_ptr = 0;
 static int vers_node_nesting = 0;
 
-static void yy_input (char *, int *, int);
+static void yy_input (char *, yy_size_t *, yy_size_t);
 static void comment (void);
 static void lex_warn_invalid (char *where, char *what);
 
@@ -94,6 +92,8 @@ int yywrap (void) { return 1; }
 #endif
 %}
 
+%option nounput
+
 %a 4000
 %o 5000
 
@@ -612,7 +612,7 @@ ldlex_popstate (void)
    either the number of characters read, or 0 to indicate EOF.  */
 
 static void
-yy_input (char *buf, int *result, int max_size)
+yy_input (char *buf, yy_size_t *result, yy_size_t max_size)
 {
   *result = 0;
   if (YY_CURRENT_BUFFER->yy_input_file)

Modified: user/attilio/vmcontention/contrib/bmake/var.c
==============================================================================
--- user/attilio/vmcontention/contrib/bmake/var.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/contrib/bmake/var.c	Sun May  5 13:28:18 2013	(r250269)
@@ -140,6 +140,17 @@ __RCSID("$NetBSD: var.c,v 1.173 2013/02/
 #include    "job.h"
 
 /*
+ * XXX transition hack for FreeBSD ports.
+ * bsd.port.mk can set .MAKE.FreeBSD_UL=yes
+ * to cause us to treat :[LU] as aliases for :t[lu]
+ * To be reverted when ports converts to :t[lu] (when 8.3 is EOL)
+ */
+#define MAKE_FREEBSD_UL ".MAKE.FreeBSD_UL"
+#ifdef MAKE_FREEBSD_UL
+static int FreeBSD_UL = FALSE;
+#endif
+
+/*
  * This lets us tell if we have replaced the original environ
  * (which we cannot free).
  */
@@ -965,6 +976,11 @@ Var_Set(const char *name, const char *va
 	setenv(MAKE_LEVEL_SAFE, tmp, 1);
 #endif
     }
+#ifdef MAKE_FREEBSD_UL
+    if (strcmp(MAKE_FREEBSD_UL, name) == 0) {
+	FreeBSD_UL = getBoolean(MAKE_FREEBSD_UL, FALSE);
+    }
+#endif
 	
 	
  out:
@@ -2660,8 +2676,24 @@ ApplyModifiers(char *nstr, const char *t
 		free(loop.str);
 		break;
 	    }
-	case 'D':
 	case 'U':
+#ifdef MAKE_FREEBSD_UL
+	    if (FreeBSD_UL) {
+		int nc = tstr[1];
+
+		/* we have to be careful, since :U is used internally */
+		if (nc == ':' || nc == endc) {
+		    char *dp = bmake_strdup(nstr);
+		    for (newStr = dp; *dp; dp++)
+			*dp = toupper((unsigned char)*dp);
+		    cp = tstr + 1;
+		    termc = *cp;
+		    break;		/* yes inside the conditional */
+		}
+		/* FALLTHROUGH */
+	    }
+#endif
+	case 'D':
 	    {
 		Buffer  buf;    	/* Buffer for patterns */
 		int	    wantit;	/* want data in buffer */
@@ -2721,6 +2753,17 @@ ApplyModifiers(char *nstr, const char *t
 		break;
 	    }
 	case 'L':
+#ifdef MAKE_FREEBSD_UL
+	    if (FreeBSD_UL) {
+		char *dp = bmake_strdup(nstr);
+		for (newStr = dp; *dp; dp++)
+		    *dp = tolower((unsigned char)*dp);
+		cp = tstr + 1;
+		termc = *cp;
+		break;
+	    }
+	    /* FALLTHROUGH */
+#endif
 	    {
 		if ((v->flags & VAR_JUNK) != 0)
 		    v->flags |= VAR_KEEP;

Modified: user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII.c	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/contrib/bsnmp/snmp_mibII/mibII.c	Sun May  5 13:28:18 2013	(r250269)
@@ -934,6 +934,34 @@ mib_find_ifa(struct in_addr addr)
 }
 
 /*
+ * Process a new ARP entry
+ */
+static void
+process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl,
+    const struct sockaddr_in *sa)
+{
+	struct mibif *ifp;
+	struct mibarp *at;
+
+	/* IP arp table entry */
+	if (sdl->sdl_alen == 0)
+		return;
+	if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL)
+		return;
+	/* have a valid entry */
+	if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL &&
+	    (at = mib_arp_create(ifp, sa->sin_addr,
+	    sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL)
+		return;
+
+	if (rtm->rtm_rmx.rmx_expire == 0)
+		at->flags |= MIBARP_PERM;
+	else
+		at->flags &= ~MIBARP_PERM;
+	at->flags |= MIBARP_FOUND;
+}
+
+/*
  * Handle a routing socket message.
  */
 static void
@@ -1075,6 +1103,23 @@ handle_rtmsg(struct rt_msghdr *rtm)
 #endif
 	  case RTM_GET:
 	  case RTM_ADD:
+		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
+		if (rtm->rtm_flags & RTF_LLINFO) {
+			if (addrs[RTAX_DST] == NULL ||
+			    addrs[RTAX_GATEWAY] == NULL ||
+			    addrs[RTAX_DST]->sa_family != AF_INET ||
+			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
+				break;
+			process_arp(rtm,
+			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
+			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
+		} else {
+			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
+				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
+				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
+		}
+		break;
+
 	  case RTM_DELETE:
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
 

Modified: user/attilio/vmcontention/contrib/libc++/CREDITS.TXT
==============================================================================
--- user/attilio/vmcontention/contrib/libc++/CREDITS.TXT	Sun May  5 12:21:22 2013	(r250268)
+++ user/attilio/vmcontention/contrib/libc++/CREDITS.TXT	Sun May  5 13:28:18 2013	(r250269)
@@ -8,69 +8,88 @@ beautification by scripts.  The fields a
 (W), PGP key ID and fingerprint (P), description (D), and snail-mail address
 (S).
 
-N: Howard Hinnant
-E: hhinnant@apple.com
-D: Architect and primary author of libc++
+N: Saleem Abdulrasool
+E: compnerd@compnerd.org
+D: Minor patches and Linux fixes.
+
+N: Dimitry Andric
+E: dimitry@andric.com
+D: Visibility fixes, minor FreeBSD portability patches.
+
+N: Holger Arnold
+E: holgerar@gmail.com
+D: Minor fix.
+
+N: Ruben Van Boxem
+E: vanboxem dot ruben at gmail dot com
+D: Initial Windows patches.
+
+N: David Chisnall
+E: theraven at theravensnest dot org
+D: FreeBSD and Solaris ports, libcxxrt support, some atomics work.
 
 N: Marshall Clow
 E: mclow.lists@gmail.com
 E: marshall@idio.com
 D: Minor patches and bug fixes.
 
-N: Bjorn Reese
-E: breese@users.sourceforge.net
-D: Initial regex prototype
+N: Google Inc.
+D: Copyright owner and contributor of the CityHash algorithm
 
-N: David Chisnall
-E: theraven at theravensnest dot org
-D: FreeBSD and Solaris ports, libcxxrt support, some atomics work.
+N: Howard Hinnant
+E: hhinnant@apple.com
+D: Architect and primary author of libc++
 
-N: Ruben Van Boxem

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305051328.r45DSJSO090676>