svn commit: r277451 - in projects/release-vmimage: . bin/csh bin/expr bin/expr/tests cddl/contrib/opensolaris/cmd/dtrace cddl/contrib/opensolaris/cmd/lockstat cddl/contrib/opensolaris/cmd/mdb/tools...

[Glen Barber]

Author: gjb
Date: Tue Jan 20 22:33:27 2015
New Revision: 277451
URL: https://svnweb.freebsd.org/changeset/base/277451

Log:
  Reintegrate head revisions r277148 through r277447
  in preparation for merging ^/projects/release-vmimage
  to ^/head.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  projects/release-vmimage/bin/expr/tests/
     - copied from r277447, head/bin/expr/tests/
  projects/release-vmimage/contrib/libc++/include/__refstring
     - copied unchanged from r277447, head/contrib/libc++/include/__refstring
  projects/release-vmimage/contrib/libc++/include/experimental/__config
     - copied unchanged from r277447, head/contrib/libc++/include/experimental/__config
  projects/release-vmimage/contrib/libc++/include/experimental/string_view
     - copied unchanged from r277447, head/contrib/libc++/include/experimental/string_view
  projects/release-vmimage/contrib/libc++/include/experimental/type_traits
     - copied unchanged from r277447, head/contrib/libc++/include/experimental/type_traits
  projects/release-vmimage/contrib/libc++/include/experimental/utility
     - copied unchanged from r277447, head/contrib/libc++/include/experimental/utility
  projects/release-vmimage/contrib/libc++/include/module.modulemap
     - copied unchanged from r277447, head/contrib/libc++/include/module.modulemap
  projects/release-vmimage/contrib/libxo/libxo/xo_error.3
     - copied unchanged from r277447, head/contrib/libxo/libxo/xo_error.3
  projects/release-vmimage/contrib/libxo/packaging/libxo.rb.base.in
     - copied unchanged from r277447, head/contrib/libxo/packaging/libxo.rb.base.in
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.H.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.H.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.H.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.H.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.HIPx.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.HIPx.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.HIPx.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.HIPx.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.HP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.HP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.HP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.HP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.J.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.J.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.J.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.J.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.JP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.JP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.JP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.JP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.T.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.T.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.T.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.T.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.X.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.X.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.X.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.X.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.XP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.XP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_08.XP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_08.XP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.H.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.H.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.H.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.H.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.HIPx.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.HIPx.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.HIPx.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.HIPx.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.HP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.HP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.HP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.HP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.J.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.J.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.J.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.J.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.JP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.JP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.JP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.JP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.T.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.T.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.T.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.T.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.X.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.X.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.X.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.X.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.XP.err
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.XP.err
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_09.XP.out
     - copied unchanged from r277447, head/contrib/libxo/tests/core/saved/test_09.XP.out
  projects/release-vmimage/contrib/libxo/tests/core/test_08.c
     - copied unchanged from r277447, head/contrib/libxo/tests/core/test_08.c
  projects/release-vmimage/contrib/libxo/tests/core/test_09.c
     - copied unchanged from r277447, head/contrib/libxo/tests/core/test_09.c
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsABIInfo.cpp
     - copied unchanged from r277447, head/contrib/llvm/lib/Target/Mips/MipsABIInfo.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsABIInfo.h
     - copied unchanged from r277447, head/contrib/llvm/lib/Target/Mips/MipsABIInfo.h
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsCCState.cpp
     - copied unchanged from r277447, head/contrib/llvm/lib/Target/Mips/MipsCCState.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsCCState.h
     - copied unchanged from r277447, head/contrib/llvm/lib/Target/Mips/MipsCCState.h
  projects/release-vmimage/contrib/llvm/patches/patch-07-llvm-r216989-r216990-fix-movw-armv6.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-07-llvm-r216989-r216990-fix-movw-armv6.diff
  projects/release-vmimage/contrib/llvm/patches/patch-08-clang-r217410-i386-garbage-float.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-08-clang-r217410-i386-garbage-float.diff
  projects/release-vmimage/contrib/llvm/patches/patch-09-llvm-r221709-debug-oom.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-09-llvm-r221709-debug-oom.diff
  projects/release-vmimage/contrib/llvm/patches/patch-10-llvm-r222562-loop-rotate.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-10-llvm-r222562-loop-rotate.diff
  projects/release-vmimage/contrib/llvm/patches/patch-11-add-llvm-gvn-option.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-11-add-llvm-gvn-option.diff
  projects/release-vmimage/contrib/llvm/patches/patch-12-llvm-r218241-dwarf2-warning.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-12-llvm-r218241-dwarf2-warning.diff
  projects/release-vmimage/contrib/llvm/patches/patch-13-llvm-r215352-aarch64-dyn-loader.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-13-llvm-r215352-aarch64-dyn-loader.diff
  projects/release-vmimage/contrib/llvm/patches/patch-14-llvm-r216571-dynamiclib-usability.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-14-llvm-r216571-dynamiclib-usability.diff
  projects/release-vmimage/contrib/llvm/patches/patch-15-clang-r221900-freebsd-aarch64.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-15-clang-r221900-freebsd-aarch64.diff
  projects/release-vmimage/contrib/llvm/patches/patch-16-llvm-r222856-libapr-miscompile.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-16-llvm-r222856-libapr-miscompile.diff
  projects/release-vmimage/contrib/llvm/patches/patch-17-llvm-r214802-armv6-cp10-cp11.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-17-llvm-r214802-armv6-cp10-cp11.diff
  projects/release-vmimage/contrib/llvm/patches/patch-18-llvm-r215811-arm-fpu-directive.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-18-llvm-r215811-arm-fpu-directive.diff
  projects/release-vmimage/contrib/llvm/patches/patch-19-enable-armv6-clrex.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-19-enable-armv6-clrex.diff
  projects/release-vmimage/contrib/llvm/patches/patch-20-llvm-r223147-arm-cpu-directive.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-20-llvm-r223147-arm-cpu-directive.diff
  projects/release-vmimage/contrib/llvm/patches/patch-21-llvm-r221170-ppc-vaarg.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-21-llvm-r221170-ppc-vaarg.diff
  projects/release-vmimage/contrib/llvm/patches/patch-22-llvm-r221791-ppc-small-pic.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-22-llvm-r221791-ppc-small-pic.diff
  projects/release-vmimage/contrib/llvm/patches/patch-23-llvm-r224415-ppc-local.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-23-llvm-r224415-ppc-local.diff
  projects/release-vmimage/contrib/llvm/patches/patch-24-llvm-r213890-ppc-eh_frame.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-24-llvm-r213890-ppc-eh_frame.diff
  projects/release-vmimage/contrib/llvm/patches/patch-25-llvm-r224890-ppc-ctr-tls-loop.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-25-llvm-r224890-ppc-ctr-tls-loop.diff
  projects/release-vmimage/contrib/llvm/patches/patch-26-clang-r213790-type_traits-crash.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-26-clang-r213790-type_traits-crash.diff
  projects/release-vmimage/contrib/llvm/patches/patch-27-llvm-r222587-arm-add-pc.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-27-llvm-r222587-arm-add-pc.diff
  projects/release-vmimage/contrib/llvm/patches/patch-28-llvm-r222292-aarch64-no-neon.diff
     - copied unchanged from r277447, head/contrib/llvm/patches/patch-28-llvm-r222292-aarch64-no-neon.diff
  projects/release-vmimage/etc/periodic/daily/510.status-world-kernel
     - copied unchanged from r277447, head/etc/periodic/daily/510.status-world-kernel
  projects/release-vmimage/share/man/man4/ixl.4
     - copied unchanged from r277447, head/share/man/man4/ixl.4
  projects/release-vmimage/share/man/man4/ixlv.4
     - copied unchanged from r277447, head/share/man/man4/ixlv.4
  projects/release-vmimage/sys/amd64/conf/MINIMAL
     - copied unchanged from r277447, head/sys/amd64/conf/MINIMAL
  projects/release-vmimage/sys/boot/i386/libi386/multiboot.c
     - copied unchanged from r277447, head/sys/boot/i386/libi386/multiboot.c
  projects/release-vmimage/sys/boot/i386/libi386/multiboot.h
     - copied unchanged from r277447, head/sys/boot/i386/libi386/multiboot.h
  projects/release-vmimage/sys/boot/i386/libi386/multiboot_tramp.S
     - copied unchanged from r277447, head/sys/boot/i386/libi386/multiboot_tramp.S
  projects/release-vmimage/sys/modules/linuxapi/
     - copied from r277447, head/sys/modules/linuxapi/
  projects/release-vmimage/sys/net/rss_config.c
     - copied unchanged from r277447, head/sys/net/rss_config.c
  projects/release-vmimage/sys/net/rss_config.h
     - copied unchanged from r277447, head/sys/net/rss_config.h
  projects/release-vmimage/sys/net/toeplitz.c
     - copied unchanged from r277447, head/sys/net/toeplitz.c
  projects/release-vmimage/sys/net/toeplitz.h
     - copied unchanged from r277447, head/sys/net/toeplitz.h
  projects/release-vmimage/sys/netinet6/in6_rss.c
     - copied unchanged from r277447, head/sys/netinet6/in6_rss.c
  projects/release-vmimage/sys/netinet6/in6_rss.h
     - copied unchanged from r277447, head/sys/netinet6/in6_rss.h
  projects/release-vmimage/sys/ofed/include/linux/linux_kmod.c
     - copied unchanged from r277447, head/sys/ofed/include/linux/linux_kmod.c
  projects/release-vmimage/sys/ofed/include/linux/linux_pci.c
     - copied unchanged from r277447, head/sys/ofed/include/linux/linux_pci.c
  projects/release-vmimage/sys/powerpc/powerpc/ptrace_machdep.c
     - copied unchanged from r277447, head/sys/powerpc/powerpc/ptrace_machdep.c
  projects/release-vmimage/usr.sbin/pmcstudy/
     - copied from r277447, head/usr.sbin/pmcstudy/
Deleted:
  projects/release-vmimage/contrib/llvm/patches/patch-07-llvm-r213960-ppc32-tls.diff
  projects/release-vmimage/contrib/llvm/patches/patch-08-llvm-r216989-r216990-fix-movw-armv6.diff
  projects/release-vmimage/contrib/llvm/patches/patch-09-clang-r217410-i386-garbage-float.diff
  projects/release-vmimage/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff
  projects/release-vmimage/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff
  projects/release-vmimage/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff
  projects/release-vmimage/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff
  projects/release-vmimage/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff
  projects/release-vmimage/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff
  projects/release-vmimage/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff
  projects/release-vmimage/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff
  projects/release-vmimage/contrib/llvm/patches/patch-18-llvm-r214802-armv6-cp10-cp11.diff
  projects/release-vmimage/contrib/llvm/patches/patch-19-llvm-r215811-arm-fpu-directive.diff
  projects/release-vmimage/contrib/llvm/patches/patch-20-enable-armv6-clrex.diff
  projects/release-vmimage/contrib/llvm/patches/patch-21-llvm-r223171-fix-vectorizer.diff
  projects/release-vmimage/contrib/llvm/patches/patch-22-llvm-r223147-arm-cpu-directive.diff
  projects/release-vmimage/contrib/llvm/patches/patch-23-llvm-r221170-ppc-vaarg.diff
  projects/release-vmimage/contrib/llvm/patches/patch-24-llvm-r221791-ppc-small-pic.diff
  projects/release-vmimage/contrib/llvm/patches/patch-25-llvm-r224415-ppc-local.diff
  projects/release-vmimage/contrib/llvm/patches/patch-26-llvm-r213890-ppc-eh_frame.diff
  projects/release-vmimage/contrib/llvm/patches/patch-27-llvm-r221703-ppc-tls_get_addr.diff
  projects/release-vmimage/contrib/llvm/patches/patch-28-llvm-r224890-ppc-ctr-tls-loop.diff
  projects/release-vmimage/contrib/llvm/patches/patch-29-clang-r213790-type_traits-crash.diff
  projects/release-vmimage/contrib/llvm/patches/patch-30-llvm-r222587-arm-add-pc.diff
  projects/release-vmimage/contrib/llvm/patches/patch-31-llvm-r222292-aarch64-no-neon.diff
  projects/release-vmimage/sys/netinet/toeplitz.c
  projects/release-vmimage/sys/netinet/toeplitz.h
Modified:
  projects/release-vmimage/ObsoleteFiles.inc
  projects/release-vmimage/UPDATING
  projects/release-vmimage/bin/csh/Makefile
  projects/release-vmimage/bin/expr/Makefile
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/sym.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/alist.h
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  projects/release-vmimage/cddl/contrib/opensolaris/common/util/strtolctype.h
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_diff.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c
  projects/release-vmimage/cddl/contrib/opensolaris/tools/ctf/cvt/util.c
  projects/release-vmimage/contrib/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
  projects/release-vmimage/contrib/ee/ee.1
  projects/release-vmimage/contrib/elftoolchain/elfcopy/sections.c
  projects/release-vmimage/contrib/elftoolchain/libelf/elf_scn.c
  projects/release-vmimage/contrib/libc++/CREDITS.TXT
  projects/release-vmimage/contrib/libc++/LICENSE.TXT
  projects/release-vmimage/contrib/libc++/include/__bit_reference
  projects/release-vmimage/contrib/libc++/include/__config
  projects/release-vmimage/contrib/libc++/include/__debug
  projects/release-vmimage/contrib/libc++/include/__functional_03
  projects/release-vmimage/contrib/libc++/include/__functional_base
  projects/release-vmimage/contrib/libc++/include/__functional_base_03
  projects/release-vmimage/contrib/libc++/include/__hash_table
  projects/release-vmimage/contrib/libc++/include/__locale
  projects/release-vmimage/contrib/libc++/include/__mutex_base
  projects/release-vmimage/contrib/libc++/include/__sso_allocator
  projects/release-vmimage/contrib/libc++/include/__tree
  projects/release-vmimage/contrib/libc++/include/__tuple
  projects/release-vmimage/contrib/libc++/include/algorithm
  projects/release-vmimage/contrib/libc++/include/atomic
  projects/release-vmimage/contrib/libc++/include/bitset
  projects/release-vmimage/contrib/libc++/include/chrono
  projects/release-vmimage/contrib/libc++/include/cmath
  projects/release-vmimage/contrib/libc++/include/condition_variable
  projects/release-vmimage/contrib/libc++/include/cstddef
  projects/release-vmimage/contrib/libc++/include/deque
  projects/release-vmimage/contrib/libc++/include/experimental/dynarray
  projects/release-vmimage/contrib/libc++/include/experimental/optional
  projects/release-vmimage/contrib/libc++/include/ext/__hash
  projects/release-vmimage/contrib/libc++/include/ext/hash_map
  projects/release-vmimage/contrib/libc++/include/forward_list
  projects/release-vmimage/contrib/libc++/include/functional
  projects/release-vmimage/contrib/libc++/include/future
  projects/release-vmimage/contrib/libc++/include/iomanip
  projects/release-vmimage/contrib/libc++/include/ios
  projects/release-vmimage/contrib/libc++/include/istream
  projects/release-vmimage/contrib/libc++/include/iterator
  projects/release-vmimage/contrib/libc++/include/limits
  projects/release-vmimage/contrib/libc++/include/list
  projects/release-vmimage/contrib/libc++/include/locale
  projects/release-vmimage/contrib/libc++/include/map
  projects/release-vmimage/contrib/libc++/include/memory
  projects/release-vmimage/contrib/libc++/include/mutex
  projects/release-vmimage/contrib/libc++/include/new
  projects/release-vmimage/contrib/libc++/include/numeric
  projects/release-vmimage/contrib/libc++/include/ostream
  projects/release-vmimage/contrib/libc++/include/random
  projects/release-vmimage/contrib/libc++/include/regex
  projects/release-vmimage/contrib/libc++/include/set
  projects/release-vmimage/contrib/libc++/include/shared_mutex
  projects/release-vmimage/contrib/libc++/include/sstream
  projects/release-vmimage/contrib/libc++/include/stdexcept
  projects/release-vmimage/contrib/libc++/include/string
  projects/release-vmimage/contrib/libc++/include/thread
  projects/release-vmimage/contrib/libc++/include/tuple
  projects/release-vmimage/contrib/libc++/include/type_traits
  projects/release-vmimage/contrib/libc++/include/typeinfo
  projects/release-vmimage/contrib/libc++/include/unordered_map
  projects/release-vmimage/contrib/libc++/include/unordered_set
  projects/release-vmimage/contrib/libc++/include/utility
  projects/release-vmimage/contrib/libc++/include/valarray
  projects/release-vmimage/contrib/libc++/include/vector
  projects/release-vmimage/contrib/libc++/src/algorithm.cpp
  projects/release-vmimage/contrib/libc++/src/chrono.cpp
  projects/release-vmimage/contrib/libc++/src/condition_variable.cpp
  projects/release-vmimage/contrib/libc++/src/debug.cpp
  projects/release-vmimage/contrib/libc++/src/exception.cpp
  projects/release-vmimage/contrib/libc++/src/future.cpp
  projects/release-vmimage/contrib/libc++/src/hash.cpp
  projects/release-vmimage/contrib/libc++/src/ios.cpp
  projects/release-vmimage/contrib/libc++/src/locale.cpp
  projects/release-vmimage/contrib/libc++/src/memory.cpp
  projects/release-vmimage/contrib/libc++/src/mutex.cpp
  projects/release-vmimage/contrib/libc++/src/new.cpp
  projects/release-vmimage/contrib/libc++/src/optional.cpp
  projects/release-vmimage/contrib/libc++/src/random.cpp
  projects/release-vmimage/contrib/libc++/src/regex.cpp
  projects/release-vmimage/contrib/libc++/src/shared_mutex.cpp
  projects/release-vmimage/contrib/libc++/src/stdexcept.cpp
  projects/release-vmimage/contrib/libc++/src/string.cpp
  projects/release-vmimage/contrib/libc++/src/strstream.cpp
  projects/release-vmimage/contrib/libc++/src/system_error.cpp
  projects/release-vmimage/contrib/libc++/src/thread.cpp
  projects/release-vmimage/contrib/libc++/src/valarray.cpp
  projects/release-vmimage/contrib/libxo/Makefile.am
  projects/release-vmimage/contrib/libxo/bin/Zaliases
  projects/release-vmimage/contrib/libxo/configure.ac
  projects/release-vmimage/contrib/libxo/doc/libxo.txt
  projects/release-vmimage/contrib/libxo/libxo/libxo.3
  projects/release-vmimage/contrib/libxo/libxo/libxo.c
  projects/release-vmimage/contrib/libxo/libxo/xo.h
  projects/release-vmimage/contrib/libxo/libxo/xo_attr.3
  projects/release-vmimage/contrib/libxo/libxo/xo_create.3
  projects/release-vmimage/contrib/libxo/libxo/xo_emit.3
  projects/release-vmimage/contrib/libxo/libxo/xo_err.3
  projects/release-vmimage/contrib/libxo/libxo/xo_finish.3
  projects/release-vmimage/contrib/libxo/libxo/xo_flush.3
  projects/release-vmimage/contrib/libxo/libxo/xo_format.5
  projects/release-vmimage/contrib/libxo/libxo/xo_no_setlocale.3
  projects/release-vmimage/contrib/libxo/libxo/xo_open_container.3
  projects/release-vmimage/contrib/libxo/libxo/xo_open_list.3
  projects/release-vmimage/contrib/libxo/libxo/xo_parse_args.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_allocator.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_flags.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_info.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_options.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_style.3
  projects/release-vmimage/contrib/libxo/libxo/xo_set_writer.3
  projects/release-vmimage/contrib/libxo/libxo/xoconfig.h
  projects/release-vmimage/contrib/libxo/libxo/xoconfig.h.in
  projects/release-vmimage/contrib/libxo/libxo/xoversion.h
  projects/release-vmimage/contrib/libxo/tests/core/Makefile.am
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.H.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.HIPx.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.HP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.J.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.JP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.T.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.X.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_01.XP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_02.J.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_02.JP.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_07.J.out
  projects/release-vmimage/contrib/libxo/tests/core/saved/test_07.JP.out
  projects/release-vmimage/contrib/libxo/tests/core/test_01.c
  projects/release-vmimage/contrib/libxo/tests/core/test_07.c
  projects/release-vmimage/contrib/libxo/xo/xo.1
  projects/release-vmimage/contrib/libxo/xo/xo.c
  projects/release-vmimage/contrib/libxo/xolint/Makefile.am
  projects/release-vmimage/contrib/libxo/xolint/xolint.1
  projects/release-vmimage/contrib/llvm/include/llvm/Analysis/AliasSetTracker.h
  projects/release-vmimage/contrib/llvm/include/llvm/CodeGen/CallingConvLower.h
  projects/release-vmimage/contrib/llvm/include/llvm/Target/TargetCallingConv.td
  projects/release-vmimage/contrib/llvm/lib/Analysis/AliasSetTracker.cpp
  projects/release-vmimage/contrib/llvm/lib/Analysis/BlockFrequencyInfoImpl.cpp
  projects/release-vmimage/contrib/llvm/lib/Analysis/ValueTracking.cpp
  projects/release-vmimage/contrib/llvm/lib/MC/MCObjectFileInfo.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h
  projects/release-vmimage/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/AsmParser/MipsAsmParser.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/Disassembler/MipsDisassembler.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/Mips.td
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/Mips16ISelLowering.h
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsAsmPrinter.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsCallingConv.td
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsConstantIslandPass.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsISelLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsISelLowering.h
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsLongBranch.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsRegisterInfo.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsSEFrameLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsSEISelLowering.h
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsSubtarget.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/Mips/MipsSubtarget.h
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/InstPrinter/PPCInstPrinter.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCFastISel.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCISelDAGToDAG.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCISelLowering.cpp
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCInstr64Bit.td
  projects/release-vmimage/contrib/llvm/lib/Target/PowerPC/PPCRegisterInfo.td
  projects/release-vmimage/contrib/llvm/lib/Target/X86/X86FastISel.cpp
  projects/release-vmimage/contrib/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
  projects/release-vmimage/contrib/llvm/lib/Transforms/Scalar/MergedLoadStoreMotion.cpp
  projects/release-vmimage/contrib/llvm/lib/Transforms/Scalar/SROA.cpp
  projects/release-vmimage/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  projects/release-vmimage/contrib/llvm/patches/README.TXT
  projects/release-vmimage/contrib/llvm/tools/clang/include/clang/Basic/DiagnosticSemaKinds.td
  projects/release-vmimage/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/release-vmimage/contrib/llvm/tools/clang/lib/CodeGen/CGExprScalar.cpp
  projects/release-vmimage/contrib/llvm/tools/clang/lib/CodeGen/TargetInfo.cpp
  projects/release-vmimage/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/release-vmimage/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp
  projects/release-vmimage/contrib/llvm/tools/clang/lib/Sema/SemaTemplate.cpp
  projects/release-vmimage/contrib/llvm/utils/TableGen/CallingConvEmitter.cpp
  projects/release-vmimage/contrib/netbsd-tests/bin/expr/t_expr.sh
  projects/release-vmimage/contrib/netbsd-tests/lib/libpthread/t_detach.c
  projects/release-vmimage/contrib/ntp/ntpd/ntp_io.c
  projects/release-vmimage/contrib/ofed/management/opensm/osmtest/main.c
  projects/release-vmimage/contrib/ofed/management/opensm/osmtest/osmtest.c
  projects/release-vmimage/crypto/openssl/CHANGES
  projects/release-vmimage/crypto/openssl/Makefile
  projects/release-vmimage/crypto/openssl/NEWS
  projects/release-vmimage/crypto/openssl/README
  projects/release-vmimage/crypto/openssl/crypto/Makefile
  projects/release-vmimage/crypto/openssl/crypto/ecdsa/Makefile
  projects/release-vmimage/crypto/openssl/crypto/ecdsa/ecs_vrf.c
  projects/release-vmimage/crypto/openssl/crypto/opensslv.h
  projects/release-vmimage/crypto/openssl/crypto/x509v3/v3_ncons.c
  projects/release-vmimage/crypto/openssl/e_os.h
  projects/release-vmimage/crypto/openssl/util/mk1mf.pl
  projects/release-vmimage/etc/defaults/periodic.conf
  projects/release-vmimage/etc/devd.conf
  projects/release-vmimage/etc/mail/Makefile
  projects/release-vmimage/etc/mtree/BSD.debug.dist
  projects/release-vmimage/etc/mtree/BSD.include.dist
  projects/release-vmimage/etc/mtree/BSD.tests.dist
  projects/release-vmimage/etc/mtree/BSD.usr.dist
  projects/release-vmimage/etc/periodic/daily/Makefile
  projects/release-vmimage/gnu/usr.bin/grep/Makefile
  projects/release-vmimage/kerberos5/lib/libasn1/Makefile
  projects/release-vmimage/kerberos5/lib/libgssapi_spnego/Makefile
  projects/release-vmimage/kerberos5/lib/libhdb/Makefile
  projects/release-vmimage/kerberos5/lib/libhx509/Makefile
  projects/release-vmimage/lib/clang/include/Makefile
  projects/release-vmimage/lib/clang/include/clang/Basic/Version.inc
  projects/release-vmimage/lib/clang/include/clang/Config/config.h
  projects/release-vmimage/lib/clang/include/llvm/Config/config.h
  projects/release-vmimage/lib/clang/libllvmmipscodegen/Makefile
  projects/release-vmimage/lib/libc++/Makefile
  projects/release-vmimage/lib/libc/Makefile
  projects/release-vmimage/lib/libc/sys/procctl.2
  projects/release-vmimage/lib/libclang_rt/Makefile.inc
  projects/release-vmimage/lib/libexpat/Makefile
  projects/release-vmimage/lib/libpam/modules/pam_radius/pam_radius.c
  projects/release-vmimage/lib/libpmc/libpmc.c
  projects/release-vmimage/lib/libunbound/Makefile
  projects/release-vmimage/lib/libusb/libusb.3
  projects/release-vmimage/lib/libusb/libusb.h
  projects/release-vmimage/lib/libusb/libusb20_desc.h
  projects/release-vmimage/lib/libvmmapi/vmmapi.c
  projects/release-vmimage/lib/libvmmapi/vmmapi.h
  projects/release-vmimage/lib/libxo/Makefile
  projects/release-vmimage/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/release-vmimage/sbin/devd/devd.conf.5
  projects/release-vmimage/sbin/route/route.c
  projects/release-vmimage/secure/lib/libcrypto/Makefile
  projects/release-vmimage/secure/lib/libcrypto/Makefile.inc
  projects/release-vmimage/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/ASN1_STRING_length.3
  projects/release-vmimage/secure/lib/libcrypto/man/ASN1_STRING_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
  projects/release-vmimage/secure/lib/libcrypto/man/ASN1_generate_nconf.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_ctrl.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_base64.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_buffer.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_cipher.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_md.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_null.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_f_ssl.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_find_type.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_new_CMS.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_push.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_read.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_accept.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_bio.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_connect.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_fd.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_file.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_mem.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_null.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_s_socket.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_set_callback.3
  projects/release-vmimage/secure/lib/libcrypto/man/BIO_should_retry.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_BLINDING_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_CTX_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_CTX_start.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_add.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_add_word.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_bn2bin.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_cmp.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_copy.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_generate_prime.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_mod_inverse.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_num_bytes.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_rand.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_set_bit.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_swap.3
  projects/release-vmimage/secure/lib/libcrypto/man/BN_zero.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_add0_cert.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_add1_recipient_cert.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_add1_signer.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_compress.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_decrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_encrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_final.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_get0_RecipientInfos.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_get0_SignerInfos.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_get0_type.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_get1_ReceiptRequest.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_sign_receipt.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_uncompress.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_verify.3
  projects/release-vmimage/secure/lib/libcrypto/man/CMS_verify_receipt.3
  projects/release-vmimage/secure/lib/libcrypto/man/CONF_modules_free.3
  projects/release-vmimage/secure/lib/libcrypto/man/CONF_modules_load_file.3
  projects/release-vmimage/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_generate_key.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_generate_parameters.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_set_method.3
  projects/release-vmimage/secure/lib/libcrypto/man/DH_size.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_SIG_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_do_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_dup_DH.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_generate_key.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_generate_parameters.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_set_method.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/DSA_size.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_GET_LIB.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_clear_error.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_error_string.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_get_error.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_load_strings.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_print_errors.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_put_error.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_remove_state.3
  projects/release-vmimage/secure/lib/libcrypto/man/ERR_set_mark.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_BytesToKey.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_DigestInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_DigestSignInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_DigestVerifyInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_EncryptInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_OpenInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_CTX_ctrl.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_CTX_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_cmp.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_decrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_derive.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_encrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_get_default_digest.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_keygen.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_print_private.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_verify.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_PKEY_verify_recover.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_SealInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_SignInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/EVP_VerifyInit.3
  projects/release-vmimage/secure/lib/libcrypto/man/OBJ_nid2obj.3
  projects/release-vmimage/secure/lib/libcrypto/man/OPENSSL_Applink.3
  projects/release-vmimage/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
  projects/release-vmimage/secure/lib/libcrypto/man/OPENSSL_config.3
  projects/release-vmimage/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
  projects/release-vmimage/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
  projects/release-vmimage/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
  projects/release-vmimage/secure/lib/libcrypto/man/PEM_write_bio_CMS_stream.3
  projects/release-vmimage/secure/lib/libcrypto/man/PEM_write_bio_PKCS7_stream.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS12_create.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS12_parse.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS7_decrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS7_encrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS7_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS7_sign_add_signer.3
  projects/release-vmimage/secure/lib/libcrypto/man/PKCS7_verify.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_add.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_bytes.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_cleanup.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_egd.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_load_file.3
  projects/release-vmimage/secure/lib/libcrypto/man/RAND_set_rand_method.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_blinding_on.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_check_key.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_generate_key.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_print.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_private_encrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_public_encrypt.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_set_method.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_sign.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
  projects/release-vmimage/secure/lib/libcrypto/man/RSA_size.3
  projects/release-vmimage/secure/lib/libcrypto/man/SMIME_read_CMS.3
  projects/release-vmimage/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
  projects/release-vmimage/secure/lib/libcrypto/man/SMIME_write_CMS.3
  projects/release-vmimage/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_NAME_print_ex.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_STORE_CTX_get_error.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_STORE_CTX_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_STORE_CTX_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_STORE_CTX_set_verify_cb.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_STORE_set_verify_cb_func.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_VERIFY_PARAM_set_flags.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_new.3
  projects/release-vmimage/secure/lib/libcrypto/man/X509_verify_cert.3
  projects/release-vmimage/secure/lib/libcrypto/man/bio.3
  projects/release-vmimage/secure/lib/libcrypto/man/blowfish.3
  projects/release-vmimage/secure/lib/libcrypto/man/bn.3
  projects/release-vmimage/secure/lib/libcrypto/man/bn_internal.3
  projects/release-vmimage/secure/lib/libcrypto/man/buffer.3
  projects/release-vmimage/secure/lib/libcrypto/man/crypto.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_DHparams.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509_CRL.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509_NAME.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509_REQ.3
  projects/release-vmimage/secure/lib/libcrypto/man/d2i_X509_SIG.3
  projects/release-vmimage/secure/lib/libcrypto/man/des.3
  projects/release-vmimage/secure/lib/libcrypto/man/dh.3
  projects/release-vmimage/secure/lib/libcrypto/man/dsa.3
  projects/release-vmimage/secure/lib/libcrypto/man/ecdsa.3
  projects/release-vmimage/secure/lib/libcrypto/man/engine.3
  projects/release-vmimage/secure/lib/libcrypto/man/err.3
  projects/release-vmimage/secure/lib/libcrypto/man/evp.3
  projects/release-vmimage/secure/lib/libcrypto/man/hmac.3
  projects/release-vmimage/secure/lib/libcrypto/man/i2d_CMS_bio_stream.3
  projects/release-vmimage/secure/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
  projects/release-vmimage/secure/lib/libcrypto/man/lh_stats.3
  projects/release-vmimage/secure/lib/libcrypto/man/lhash.3
  projects/release-vmimage/secure/lib/libcrypto/man/md5.3
  projects/release-vmimage/secure/lib/libcrypto/man/mdc2.3
  projects/release-vmimage/secure/lib/libcrypto/man/pem.3
  projects/release-vmimage/secure/lib/libcrypto/man/rand.3
  projects/release-vmimage/secure/lib/libcrypto/man/rc4.3
  projects/release-vmimage/secure/lib/libcrypto/man/ripemd.3
  projects/release-vmimage/secure/lib/libcrypto/man/rsa.3
  projects/release-vmimage/secure/lib/libcrypto/man/sha.3
  projects/release-vmimage/secure/lib/libcrypto/man/threads.3
  projects/release-vmimage/secure/lib/libcrypto/man/ui.3
  projects/release-vmimage/secure/lib/libcrypto/man/ui_compat.3
  projects/release-vmimage/secure/lib/libcrypto/man/x509.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CIPHER_get_name.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_add_session.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_ctrl.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_free.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_new.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_sess_number.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_sessions.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_mode.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_options.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_psk_client_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_timeout.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_tlsext_ticket_key_cb.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_set_verify.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_use_certificate.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_CTX_use_psk_identity_hint.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_SESSION_free.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_SESSION_get_time.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_accept.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_alert_type_string.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_clear.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_connect.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_do_handshake.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_free.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_SSL_CTX.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_ciphers.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_client_CA_list.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_current_cipher.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_default_timeout.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_error.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_ex_new_index.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_fd.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_peer_certificate.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_psk_identity.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_rbio.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_session.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_verify_result.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_get_version.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_library_init.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_load_client_CA_file.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_new.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_pending.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_read.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_rstate_string.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_session_reused.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_bio.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_connect_state.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_fd.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_session.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_shutdown.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_set_verify_result.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_shutdown.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_state_string.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_want.3
  projects/release-vmimage/secure/lib/libssl/man/SSL_write.3
  projects/release-vmimage/secure/lib/libssl/man/d2i_SSL_SESSION.3
  projects/release-vmimage/secure/lib/libssl/man/ssl.3
  projects/release-vmimage/secure/usr.bin/openssl/man/CA.pl.1
  projects/release-vmimage/secure/usr.bin/openssl/man/asn1parse.1
  projects/release-vmimage/secure/usr.bin/openssl/man/c_rehash.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ca.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ciphers.1
  projects/release-vmimage/secure/usr.bin/openssl/man/cms.1
  projects/release-vmimage/secure/usr.bin/openssl/man/crl.1
  projects/release-vmimage/secure/usr.bin/openssl/man/crl2pkcs7.1
  projects/release-vmimage/secure/usr.bin/openssl/man/dgst.1
  projects/release-vmimage/secure/usr.bin/openssl/man/dhparam.1
  projects/release-vmimage/secure/usr.bin/openssl/man/dsa.1
  projects/release-vmimage/secure/usr.bin/openssl/man/dsaparam.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ec.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ecparam.1
  projects/release-vmimage/secure/usr.bin/openssl/man/enc.1
  projects/release-vmimage/secure/usr.bin/openssl/man/errstr.1
  projects/release-vmimage/secure/usr.bin/openssl/man/gendsa.1
  projects/release-vmimage/secure/usr.bin/openssl/man/genpkey.1
  projects/release-vmimage/secure/usr.bin/openssl/man/genrsa.1
  projects/release-vmimage/secure/usr.bin/openssl/man/nseq.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ocsp.1
  projects/release-vmimage/secure/usr.bin/openssl/man/openssl.1
  projects/release-vmimage/secure/usr.bin/openssl/man/passwd.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkcs12.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkcs7.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkcs8.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkey.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkeyparam.1
  projects/release-vmimage/secure/usr.bin/openssl/man/pkeyutl.1
  projects/release-vmimage/secure/usr.bin/openssl/man/rand.1
  projects/release-vmimage/secure/usr.bin/openssl/man/req.1
  projects/release-vmimage/secure/usr.bin/openssl/man/rsa.1
  projects/release-vmimage/secure/usr.bin/openssl/man/rsautl.1
  projects/release-vmimage/secure/usr.bin/openssl/man/s_client.1
  projects/release-vmimage/secure/usr.bin/openssl/man/s_server.1
  projects/release-vmimage/secure/usr.bin/openssl/man/s_time.1
  projects/release-vmimage/secure/usr.bin/openssl/man/sess_id.1
  projects/release-vmimage/secure/usr.bin/openssl/man/smime.1
  projects/release-vmimage/secure/usr.bin/openssl/man/speed.1
  projects/release-vmimage/secure/usr.bin/openssl/man/spkac.1
  projects/release-vmimage/secure/usr.bin/openssl/man/ts.1
  projects/release-vmimage/secure/usr.bin/openssl/man/tsget.1
  projects/release-vmimage/secure/usr.bin/openssl/man/verify.1
  projects/release-vmimage/secure/usr.bin/openssl/man/version.1
  projects/release-vmimage/secure/usr.bin/openssl/man/x509.1
  projects/release-vmimage/secure/usr.bin/openssl/man/x509v3_config.1
  projects/release-vmimage/share/examples/bhyve/vmrun.sh
  projects/release-vmimage/share/man/man4/Makefile
  projects/release-vmimage/share/man/man4/bpf.4
  projects/release-vmimage/share/man/man5/periodic.conf.5
  projects/release-vmimage/share/man/man7/hier.7
  projects/release-vmimage/share/man/man9/Makefile
  projects/release-vmimage/share/man/man9/timeout.9
  projects/release-vmimage/share/misc/committers-ports.dot
  projects/release-vmimage/share/mk/bsd.cpu.mk
  projects/release-vmimage/share/mk/sys.mk
  projects/release-vmimage/sys/amd64/conf/NOTES
  projects/release-vmimage/sys/amd64/include/metadata.h
  projects/release-vmimage/sys/amd64/include/vmm.h   (contents, props changed)
  projects/release-vmimage/sys/amd64/include/vmm_dev.h   (contents, props changed)
  projects/release-vmimage/sys/amd64/vmm/amd/svm.c
  projects/release-vmimage/sys/amd64/vmm/intel/vmx.c
  projects/release-vmimage/sys/amd64/vmm/vmm.c
  projects/release-vmimage/sys/amd64/vmm/vmm_dev.c
  projects/release-vmimage/sys/amd64/vmm/vmm_instruction_emul.c
  projects/release-vmimage/sys/amd64/vmm/vmm_ioport.c
  projects/release-vmimage/sys/arm/arm/cpufunc.c
  projects/release-vmimage/sys/arm/arm/identcpu.c
  projects/release-vmimage/sys/arm/arm/locore-v4.S
  projects/release-vmimage/sys/arm/arm/locore-v6.S
  projects/release-vmimage/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
  projects/release-vmimage/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
  projects/release-vmimage/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
  projects/release-vmimage/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
  projects/release-vmimage/sys/arm/conf/NOTES
  projects/release-vmimage/sys/arm/conf/RK3188
  projects/release-vmimage/sys/arm/include/armreg.h
  projects/release-vmimage/sys/arm/include/cpu-v6.h
  projects/release-vmimage/sys/arm/rockchip/files.rk30xx
  projects/release-vmimage/sys/arm/ti/am335x/am335x_lcd.c
  projects/release-vmimage/sys/arm/ti/cpsw/if_cpsw.c
  projects/release-vmimage/sys/arm/xilinx/zy7_mp.c
  projects/release-vmimage/sys/boot/common/bootstrap.h
  projects/release-vmimage/sys/boot/common/load_elf.c
  projects/release-vmimage/sys/boot/common/load_elf_obj.c
  projects/release-vmimage/sys/boot/common/module.c
  projects/release-vmimage/sys/boot/fdt/dts/arm/beaglebone-black.dts
  projects/release-vmimage/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts
  projects/release-vmimage/sys/boot/fdt/dts/arm/rk3188-radxa.dts
  projects/release-vmimage/sys/boot/fdt/dts/arm/rk3188.dtsi
  projects/release-vmimage/sys/boot/fdt/fdt_loader_cmd.c
  projects/release-vmimage/sys/boot/forth/beastie.4th
  projects/release-vmimage/sys/boot/forth/loader.4th
  projects/release-vmimage/sys/boot/forth/support.4th
  projects/release-vmimage/sys/boot/i386/libi386/Makefile
  projects/release-vmimage/sys/boot/i386/libi386/bootinfo64.c
  projects/release-vmimage/sys/boot/i386/libi386/elf64_freebsd.c
  projects/release-vmimage/sys/boot/i386/libi386/libi386.h
  projects/release-vmimage/sys/boot/i386/loader/conf.c
  projects/release-vmimage/sys/cam/cam_xpt.c
  projects/release-vmimage/sys/cam/ctl/scsi_ctl.c
  projects/release-vmimage/sys/cam/scsi/scsi_da.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/common/util/strtolctype.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
  projects/release-vmimage/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
  projects/release-vmimage/sys/cddl/dev/dtrace/amd64/instr_size.c
  projects/release-vmimage/sys/cddl/dev/dtrace/dtrace_ioctl.c
  projects/release-vmimage/sys/cddl/dev/dtrace/i386/instr_size.c
  projects/release-vmimage/sys/cddl/dev/dtrace/x86/regset.h
  projects/release-vmimage/sys/compat/freebsd32/freebsd32_misc.c
  projects/release-vmimage/sys/conf/NOTES
  projects/release-vmimage/sys/conf/files
  projects/release-vmimage/sys/conf/files.powerpc
  projects/release-vmimage/sys/conf/ldscript.powerpc
  projects/release-vmimage/sys/conf/ldscript.powerpc64
  projects/release-vmimage/sys/conf/options
  projects/release-vmimage/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c
  projects/release-vmimage/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c
  projects/release-vmimage/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c
  projects/release-vmimage/sys/contrib/dev/ath/ath_hal/ar9300/ar9300desc.h
  projects/release-vmimage/sys/contrib/rdma/krping/krping.c
  projects/release-vmimage/sys/dev/acpica/acpi_cpu.c
  projects/release-vmimage/sys/dev/ath/ath_hal/ah.h
  projects/release-vmimage/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
  projects/release-vmimage/sys/dev/ath/if_ath.c
  projects/release-vmimage/sys/dev/ath/if_ath_btcoex.c
  projects/release-vmimage/sys/dev/cardbus/cardbus.c
  projects/release-vmimage/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  projects/release-vmimage/sys/dev/cxgbe/iw_cxgbe/device.c
  projects/release-vmimage/sys/dev/cxgbe/t4_main.c
  projects/release-vmimage/sys/dev/cxgbe/t4_mp_ring.c
  projects/release-vmimage/sys/dev/e1000/if_igb.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_core.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_intel.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_logging.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_mod.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_piv.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_uncore.c
  projects/release-vmimage/sys/dev/hwpmc/hwpmc_x86.c
  projects/release-vmimage/sys/dev/hwpmc/pmc_events.h
  projects/release-vmimage/sys/dev/iicbus/adt746x.c
  projects/release-vmimage/sys/dev/ixgbe/ixgbe.c
  projects/release-vmimage/sys/dev/ixl/if_ixl.c
  projects/release-vmimage/sys/dev/ixl/if_ixlv.c
  projects/release-vmimage/sys/dev/ixl/ixl_txrx.c
  projects/release-vmimage/sys/dev/mii/mii.c
  projects/release-vmimage/sys/dev/mii/mii_physubr.c
  projects/release-vmimage/sys/dev/mii/miivar.h
  projects/release-vmimage/sys/dev/mmc/host/dwmmc.c
  projects/release-vmimage/sys/dev/mmc/host/dwmmc.h
  projects/release-vmimage/sys/dev/ofw/ofw_cpu.c
  projects/release-vmimage/sys/dev/ofw/ofw_fdt.c
  projects/release-vmimage/sys/dev/pccbb/pccbb.c
  projects/release-vmimage/sys/dev/pccbb/pccbb_isa.c
  projects/release-vmimage/sys/dev/pccbb/pccbb_pci.c
  projects/release-vmimage/sys/dev/pccbb/pccbbvar.h
  projects/release-vmimage/sys/dev/sdhci/sdhci.c
  projects/release-vmimage/sys/dev/sdhci/sdhci.h
  projects/release-vmimage/sys/dev/sound/pci/emu10kx.c
  projects/release-vmimage/sys/dev/sound/pci/envy24.c
  projects/release-vmimage/sys/dev/sound/pci/envy24ht.c
  projects/release-vmimage/sys/dev/sound/pcm/channel.c
  projects/release-vmimage/sys/dev/usb/net/if_cdce.c
  projects/release-vmimage/sys/dev/usb/net/if_cdcereg.h
  projects/release-vmimage/sys/dev/usb/serial/u3g.c
  projects/release-vmimage/sys/dev/usb/usb_device.c
  projects/release-vmimage/sys/dev/usb/usb_generic.c
  projects/release-vmimage/sys/dev/usb/usbdevs
  projects/release-vmimage/sys/fs/devfs/devfs_devs.c
  projects/release-vmimage/sys/fs/devfs/devfs_int.h
  projects/release-vmimage/sys/fs/devfs/devfs_vnops.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_alloc.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_bmap.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_extents.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_hash.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_htree.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_inode.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_lookup.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_vfsops.c
  projects/release-vmimage/sys/fs/ext2fs/ext2_vnops.c
  projects/release-vmimage/sys/fs/fifofs/fifo_vnops.c
  projects/release-vmimage/sys/geom/geom_dev.c
  projects/release-vmimage/sys/i386/include/metadata.h
  projects/release-vmimage/sys/kern/init_main.c
  projects/release-vmimage/sys/kern/kern_condvar.c
  projects/release-vmimage/sys/kern/kern_conf.c
  projects/release-vmimage/sys/kern/kern_exec.c
  projects/release-vmimage/sys/kern/kern_fork.c
  projects/release-vmimage/sys/kern/kern_jail.c
  projects/release-vmimage/sys/kern/kern_lock.c
  projects/release-vmimage/sys/kern/kern_procctl.c
  projects/release-vmimage/sys/kern/kern_prot.c
  projects/release-vmimage/sys/kern/kern_sig.c
  projects/release-vmimage/sys/kern/kern_switch.c
  projects/release-vmimage/sys/kern/kern_synch.c
  projects/release-vmimage/sys/kern/kern_tc.c
  projects/release-vmimage/sys/kern/kern_thread.c
  projects/release-vmimage/sys/kern/kern_timeout.c
  projects/release-vmimage/sys/kern/subr_dummy_vdso_tc.c
  projects/release-vmimage/sys/kern/subr_sleepqueue.c
  projects/release-vmimage/sys/kern/uipc_mbuf.c
  projects/release-vmimage/sys/mips/include/cache_mipsNN.h
  projects/release-vmimage/sys/mips/mips/cache.c
  projects/release-vmimage/sys/mips/mips/cache_mipsNN.c
  projects/release-vmimage/sys/modules/Makefile
  projects/release-vmimage/sys/modules/cardbus/Makefile
  projects/release-vmimage/sys/modules/cbb/Makefile
  projects/release-vmimage/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/release-vmimage/sys/modules/ibcore/Makefile
  projects/release-vmimage/sys/modules/ipoib/Makefile
  projects/release-vmimage/sys/modules/mlx4/Makefile
  projects/release-vmimage/sys/modules/mlx4ib/Makefile
  projects/release-vmimage/sys/net/bpf.c
  projects/release-vmimage/sys/net/if_ethersubr.c
  projects/release-vmimage/sys/net/if_lagg.c
  projects/release-vmimage/sys/netinet/in_pcb.c
  projects/release-vmimage/sys/netinet/in_pcbgroup.c
  projects/release-vmimage/sys/netinet/in_rss.c
  projects/release-vmimage/sys/netinet/in_rss.h
  projects/release-vmimage/sys/netinet/ip_input.c
  projects/release-vmimage/sys/netinet/ip_output.c
  projects/release-vmimage/sys/netinet/sctp_asconf.c
  projects/release-vmimage/sys/netinet/sctp_input.c
  projects/release-vmimage/sys/netinet/sctp_output.c
  projects/release-vmimage/sys/netinet/sctp_sysctl.c
  projects/release-vmimage/sys/netinet/sctp_timer.c
  projects/release-vmimage/sys/netinet/sctp_usrreq.c
  projects/release-vmimage/sys/netinet/tcp_timer.c
  projects/release-vmimage/sys/netinet/udp_usrreq.c
  projects/release-vmimage/sys/netinet6/in6_pcbgroup.c
  projects/release-vmimage/sys/netinet6/ip6_output.c
  projects/release-vmimage/sys/netinet6/udp6_usrreq.c
  projects/release-vmimage/sys/netpfil/ipfw/ip_fw_nat.c
  projects/release-vmimage/sys/ofed/drivers/infiniband/core/device.c
  projects/release-vmimage/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  projects/release-vmimage/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c
  projects/release-vmimage/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/release-vmimage/sys/ofed/drivers/net/mlx4/en_main.c
  projects/release-vmimage/sys/ofed/drivers/net/mlx4/main.c
  projects/release-vmimage/sys/ofed/include/linux/bitops.h
  projects/release-vmimage/sys/ofed/include/linux/cache.h
  projects/release-vmimage/sys/ofed/include/linux/completion.h
  projects/release-vmimage/sys/ofed/include/linux/dma-mapping.h
  projects/release-vmimage/sys/ofed/include/linux/etherdevice.h
  projects/release-vmimage/sys/ofed/include/linux/gfp.h
  projects/release-vmimage/sys/ofed/include/linux/io.h
  projects/release-vmimage/sys/ofed/include/linux/kernel.h
  projects/release-vmimage/sys/ofed/include/linux/ktime.h
  projects/release-vmimage/sys/ofed/include/linux/linux_compat.c
  projects/release-vmimage/sys/ofed/include/linux/linux_idr.c
  projects/release-vmimage/sys/ofed/include/linux/module.h
  projects/release-vmimage/sys/ofed/include/linux/pci.h
  projects/release-vmimage/sys/ofed/include/linux/slab.h
  projects/release-vmimage/sys/powerpc/aim/locore32.S
  projects/release-vmimage/sys/powerpc/aim/locore64.S
  projects/release-vmimage/sys/powerpc/aim/machdep.c
  projects/release-vmimage/sys/powerpc/aim/mmu_oea64.c
  projects/release-vmimage/sys/powerpc/aim/trap_subr64.S
  projects/release-vmimage/sys/powerpc/booke/locore.S
  projects/release-vmimage/sys/powerpc/conf/MPC85XX
  projects/release-vmimage/sys/powerpc/conf/NOTES
  projects/release-vmimage/sys/powerpc/include/asm.h
  projects/release-vmimage/sys/powerpc/include/ptrace.h
  projects/release-vmimage/sys/powerpc/include/reg.h
  projects/release-vmimage/sys/powerpc/include/trap.h
  projects/release-vmimage/sys/powerpc/ofw/ofw_machdep.c
  projects/release-vmimage/sys/powerpc/ofw/ofwcall64.S
  projects/release-vmimage/sys/powerpc/powerpc/elf64_machdep.c
  projects/release-vmimage/sys/powerpc/powerpc/intr_machdep.c
  projects/release-vmimage/sys/powerpc/powerpc/mem.c
  projects/release-vmimage/sys/powerpc/powerpc/swtch64.S
  projects/release-vmimage/sys/powerpc/powerpc/vm_machdep.c
  projects/release-vmimage/sys/sys/_callout.h
  projects/release-vmimage/sys/sys/callout.h
  projects/release-vmimage/sys/sys/capsicum.h
  projects/release-vmimage/sys/sys/conf.h
  projects/release-vmimage/sys/sys/jail.h
  projects/release-vmimage/sys/sys/mbuf.h
  projects/release-vmimage/sys/sys/module.h
  projects/release-vmimage/sys/sys/param.h
  projects/release-vmimage/sys/sys/pmc.h
  projects/release-vmimage/sys/sys/priv.h
  projects/release-vmimage/sys/sys/proc.h
  projects/release-vmimage/sys/sys/procctl.h
  projects/release-vmimage/sys/sys/signalvar.h
  projects/release-vmimage/sys/sys/vdso.h
  projects/release-vmimage/sys/vm/vm_fault.c
  projects/release-vmimage/sys/x86/isa/atpic.c
  projects/release-vmimage/sys/x86/x86/tsc.c
  projects/release-vmimage/sys/x86/xen/pv.c
  projects/release-vmimage/tools/build/mk/OptionalObsoleteFiles.inc
  projects/release-vmimage/tools/regression/execve/Makefile
  projects/release-vmimage/tools/test/dtrace/Makefile
  projects/release-vmimage/usr.bin/gcore/elfcore.c
  projects/release-vmimage/usr.bin/grep/Makefile
  projects/release-vmimage/usr.bin/lex/Makefile
  projects/release-vmimage/usr.bin/make/Makefile
  projects/release-vmimage/usr.sbin/Makefile
  projects/release-vmimage/usr.sbin/bhyve/bhyverun.c
  projects/release-vmimage/usr.sbin/bhyve/bhyverun.h
  projects/release-vmimage/usr.sbin/bhyve/inout.c
  projects/release-vmimage/usr.sbin/bhyve/task_switch.c
  projects/release-vmimage/usr.sbin/bhyvectl/bhyvectl.c
  projects/release-vmimage/usr.sbin/bsdinstall/scripts/zfsboot
  projects/release-vmimage/usr.sbin/crunch/crunchide/exec_elf32.c
  projects/release-vmimage/usr.sbin/fstyp/fstyp.8
  projects/release-vmimage/usr.sbin/kldxref/kldxref.c
  projects/release-vmimage/usr.sbin/mountd/mountd.c
  projects/release-vmimage/usr.sbin/mtree/Makefile
  projects/release-vmimage/usr.sbin/ngctl/main.c
  projects/release-vmimage/usr.sbin/ofwdump/ofwdump.c
  projects/release-vmimage/usr.sbin/rpc.lockd/lockd.c
  projects/release-vmimage/usr.sbin/rpc.statd/statd.c
Directory Properties:
  projects/release-vmimage/   (props changed)
  projects/release-vmimage/cddl/   (props changed)
  projects/release-vmimage/cddl/contrib/opensolaris/   (props changed)
  projects/release-vmimage/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/release-vmimage/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/release-vmimage/contrib/compiler-rt/   (props changed)
  projects/release-vmimage/contrib/ee/   (props changed)
  projects/release-vmimage/contrib/elftoolchain/   (props changed)
  projects/release-vmimage/contrib/libc++/   (props changed)
  projects/release-vmimage/contrib/llvm/   (props changed)
  projects/release-vmimage/contrib/llvm/tools/clang/   (props changed)
  projects/release-vmimage/contrib/ntp/   (props changed)
  projects/release-vmimage/crypto/openssl/   (props changed)
  projects/release-vmimage/etc/   (props changed)
  projects/release-vmimage/lib/libc/   (props changed)
  projects/release-vmimage/lib/libvmmapi/   (props changed)
  projects/release-vmimage/sbin/   (props changed)
  projects/release-vmimage/share/   (props changed)
  projects/release-vmimage/share/man/man4/   (props changed)
  projects/release-vmimage/sys/   (props changed)
  projects/release-vmimage/sys/amd64/vmm/   (props changed)
  projects/release-vmimage/sys/boot/   (props changed)
  projects/release-vmimage/sys/cddl/contrib/opensolaris/   (props changed)
  projects/release-vmimage/sys/conf/   (props changed)
  projects/release-vmimage/usr.sbin/bhyve/   (props changed)
  projects/release-vmimage/usr.sbin/bhyvectl/   (props changed)

Modified: projects/release-vmimage/ObsoleteFiles.inc
==============================================================================
--- projects/release-vmimage/ObsoleteFiles.inc	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/ObsoleteFiles.inc	Tue Jan 20 22:33:27 2015	(r277451)
@@ -38,6 +38,60 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20150118: new clang import which bumps version from 3.5.0 to 3.5.1.
+OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_aes.h
+OLD_FILES+=usr/include/clang/3.5.0/__wmmintrin_pclmul.h
+OLD_FILES+=usr/include/clang/3.5.0/altivec.h
+OLD_FILES+=usr/include/clang/3.5.0/ammintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/arm_acle.h
+OLD_FILES+=usr/include/clang/3.5.0/arm_neon.h
+OLD_FILES+=usr/include/clang/3.5.0/avx2intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/avxintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/bmi2intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/bmiintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/cpuid.h
+OLD_FILES+=usr/include/clang/3.5.0/emmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/f16cintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/fma4intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/fmaintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/ia32intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/immintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/lzcntintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/mm3dnow.h
+OLD_FILES+=usr/include/clang/3.5.0/mm_malloc.h
+OLD_FILES+=usr/include/clang/3.5.0/mmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/module.modulemap
+OLD_FILES+=usr/include/clang/3.5.0/nmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/pmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/popcntintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/prfchwintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/rdseedintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/rtmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/shaintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/smmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/tbmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/tmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/wmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/x86intrin.h
+OLD_FILES+=usr/include/clang/3.5.0/xmmintrin.h
+OLD_FILES+=usr/include/clang/3.5.0/xopintrin.h
+OLD_DIRS+=usr/include/clang/3.5.0
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.san-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan-x86_64.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/3.5.0/lib/freebsd/libclang_rt.ubsan_cxx-x86_64.a
+OLD_DIRS+=usr/lib/clang/3.5.0/lib/freebsd
+OLD_DIRS+=usr/lib/clang/3.5.0/lib
+OLD_DIRS+=usr/lib/clang/3.5.0
 # 20150102: removal of texinfo
 OLD_FILES+=usr/bin/info
 OLD_FILES+=usr/bin/infokey

Modified: projects/release-vmimage/UPDATING
==============================================================================
--- projects/release-vmimage/UPDATING	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/UPDATING	Tue Jan 20 22:33:27 2015	(r277451)
@@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20150118:
+	Clang and llvm have been upgraded to 3.5.1 release.  This is a bugfix
+	only release, no new features have been added.  Please see the 20141231
+	entry below for information about prerequisites and upgrading, if you
+	are not already using 3.5.0.
+
 20150107:
 	ELF tools addr2line, elfcopy (strip), nm, size, and strings are now
 	taken from the ELF Tool Chain project rather than GNU binutils. They

Modified: projects/release-vmimage/bin/csh/Makefile
==============================================================================
--- projects/release-vmimage/bin/csh/Makefile	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/bin/csh/Makefile	Tue Jan 20 22:33:27 2015	(r277451)
@@ -93,7 +93,7 @@ GENHDRS+= iconv.h
 SRCS+=	iconv_stub.c
 
 iconv.h: ${.CURDIR}/iconv_stub.h
-	cp -f ${.CURDIR}/iconv_stub.h ${.TARGET}
+	${CP} ${.CURDIR}/iconv_stub.h ${.TARGET}
 .endif
 .endif
 

Modified: projects/release-vmimage/bin/expr/Makefile
==============================================================================
--- projects/release-vmimage/bin/expr/Makefile	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/bin/expr/Makefile	Tue Jan 20 22:33:27 2015	(r277451)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	expr
 SRCS=	expr.y
 YFLAGS=
 
 NO_WMISSING_VARIABLE_DECLARATIONS=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -43,11 +43,11 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <libgen.h>
-#if defined(sun)
+#ifdef illumos
 #include <libproc.h>
 #endif
 
@@ -101,7 +101,7 @@ static int g_grabanon = 0;
 static const char *g_ofile = NULL;
 static FILE *g_ofp;
 static dtrace_hdl_t *g_dtp;
-#if defined(sun)
+#ifdef illumos
 static char *g_etcfile = "/etc/system";
 static const char *g_etcbegin = "* vvvv Added by DTrace";
 static const char *g_etcend = "* ^^^^ Added by DTrace";
@@ -211,7 +211,7 @@ fatal(const char *fmt, ...)
 static void
 dfatal(const char *fmt, ...)
 {
-#if !defined(sun) && defined(NEED_ERRLOC)
+#if !defined(illumos) && defined(NEED_ERRLOC)
 	char *p_errfile = NULL;
 	int errline = 0;
 #endif
@@ -232,7 +232,7 @@ dfatal(const char *fmt, ...)
 		(void) fprintf(stderr, "%s\n",
 		    dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
 	}
-#if !defined(sun) && defined(NEED_ERRLOC)
+#if !defined(illumos) && defined(NEED_ERRLOC)
 	dt_get_errloc(g_dtp, &p_errfile, &errline);
 	if (p_errfile != NULL)
 		printf("File '%s', line %d\n", p_errfile, errline);
@@ -397,7 +397,7 @@ dof_prune(const char *fname)
 	free(buf);
 }
 
-#if defined(sun)
+#ifdef illumos
 static void
 etcsystem_prune(void)
 {
@@ -508,7 +508,7 @@ etcsystem_add(void)
 
 	error("added forceload directives to %s\n", g_ofile);
 }
-#endif
+#endif /* illumos */
 
 static void
 print_probe_info(const dtrace_probeinfo_t *p)
@@ -643,7 +643,7 @@ anon_prog(const dtrace_cmd_t *dcp, dof_h
 	p = (uchar_t *)dof;
 	q = p + dof->dofh_loadsz;
 
-#if defined(sun)
+#ifdef illumos
 	oprintf("dof-data-%d=0x%x", n, *p++);
 
 	while (p < q)
@@ -793,7 +793,7 @@ compile_str(dtrace_cmd_t *dcp)
 static void
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
-#if defined(sun)
+#ifdef illumos
 	const psinfo_t *prp = Ppsinfo(P);
 	int pid = Pstatus(P)->pr_pid;
 	char name[SIG2STR_MAX];
@@ -807,13 +807,13 @@ prochandler(struct ps_prochandle *P, con
 		return;
 	}
 
-#if defined(sun)
+#ifdef illumos
 	switch (Pstate(P)) {
 #else
 	switch (proc_state(P)) {
 #endif
 	case PS_UNDEAD:
-#if defined(sun)
+#ifdef illumos
 		/*
 		 * Ideally we would like to always report pr_wstat here, but it
 		 * isn't possible given current /proc semantics.  If we grabbed
@@ -831,7 +831,7 @@ prochandler(struct ps_prochandle *P, con
 			notice("pid %d terminated by %d\n", pid,
 			    WTERMSIG(wstatus));
 #endif
-#if defined(sun)
+#ifdef illumos
 		} else if (prp != NULL && WEXITSTATUS(prp->pr_wstat) != 0) {
 			notice("pid %d exited with status %d\n",
 			    pid, WEXITSTATUS(prp->pr_wstat));
@@ -1238,7 +1238,7 @@ installsighands(void)
 	if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGTERM, &act, NULL);
 
-#if !defined(sun)
+#ifndef illumos
 	if (sigaction(SIGPIPE, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
 		(void) sigaction(SIGPIPE, &act, NULL);
 
@@ -1720,7 +1720,7 @@ main(int argc, char *argv[])
 
 	case DMODE_ANON:
 		if (g_ofile == NULL)
-#if defined(sun)
+#ifdef illumos
 			g_ofile = "/kernel/drv/dtrace.conf";
 #else
 			/*
@@ -1732,7 +1732,7 @@ main(int argc, char *argv[])
 #endif
 
 		dof_prune(g_ofile); /* strip out any old DOF directives */
-#if defined(sun)
+#ifdef illumos
 		etcsystem_prune(); /* string out any forceload directives */
 #endif
 
@@ -1765,7 +1765,7 @@ main(int argc, char *argv[])
 		 * that itself contains a #pragma D option quiet.
 		 */
 		error("saved anonymous enabling in %s\n", g_ofile);
-#if defined(sun)
+#ifdef illumos
 		etcsystem_add();
 		error("run update_drv(1M) or reboot to enable changes\n");
 #endif

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -46,10 +46,9 @@
 #include <signal.h>
 #include <assert.h>
 
-#if defined(sun)
+#ifdef illumos
 #define	GETOPT_EOF	EOF
 #else
-/* FreeBSD */ 
 #include <sys/time.h>
 #include <sys/resource.h>
 
@@ -57,7 +56,7 @@
 #define	GETOPT_EOF		(-1)
 
 typedef	uintptr_t	pc_t;
-#endif /* defined(sun) */
+#endif
 
 #define	LOCKSTAT_OPTSTR	"x:bths:n:d:i:l:f:e:ckwWgCHEATID:RpPo:V"
 
@@ -214,10 +213,9 @@ static ls_event_info_t g_event_info[LS_M
 	{ 'H',	"Lock",	"Unknown event (type 53)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 54)",		"units"	},
 	{ 'H',	"Lock",	"Unknown event (type 55)",		"units"	},
-#if defined(sun)
+#ifdef illumos
 	{ 'I',	"CPU+PIL", "Profiling interrupt",		"nsec",
 #else
-	/* FreeBSD */
 	{ 'I',	"CPU+Pri_Class", "Profiling interrupt",		"nsec",
 #endif
 	    "profile:::profile-97", NULL },
@@ -231,7 +229,7 @@ static ls_event_info_t g_event_info[LS_M
 	{ 'E',	"Lock",	"Lockstat record failure",		"(N/A)"	},
 };
 
-#if !defined(sun)
+#ifndef illumos
 static char *g_pri_class[] = {
 	"",
 	"Intr",
@@ -598,7 +596,7 @@ filter_add(char **filt, char *what, uint
 		*filt[0] = '\0';
 	}
 
-#if defined(sun)
+#ifdef illumos
 	(void) sprintf(c, "%s(%s >= 0x%p && %s < 0x%p)", *filt[0] != '\0' ?
 	    " || " : "", what, (void *)base, what, (void *)(base + size));
 #else
@@ -676,7 +674,7 @@ dprog_addevent(int event)
 		 * the number of nanoseconds) is the number of nanoseconds
 		 * late -- and it's stored in arg2.
 		 */
-#if defined(sun)
+#ifdef illumos
 		arg0 = "(uintptr_t)curthread->t_cpu + \n"
 		    "\t    curthread->t_cpu->cpu_profile_pil";
 #else
@@ -824,7 +822,7 @@ dprog_compile()
 }
 
 static void
-#if defined(sun)
+#ifdef illumos
 status_fire(void)
 #else
 status_fire(int i)
@@ -1423,7 +1421,7 @@ main(int argc, char **argv)
 		exit(127);
 	}
 
-#if defined(sun)
+#ifdef illumos
 	while (waitpid(child, &status, WEXITED) != child)
 #else
 	while (waitpid(child, &status, 0) != child)
@@ -1468,7 +1466,7 @@ main(int argc, char **argv)
 			dfail("failed to walk aggregate");
 	}
 
-#if defined(sun)
+#ifdef illumos
 	if ((data_buf = memalign(sizeof (uint64_t),
 	    (g_nrecs + 1) * g_recsize)) == NULL)
 #else
@@ -1500,7 +1498,7 @@ main(int argc, char **argv)
 	if (g_gflag) {
 		lsrec_t *newlsp, *oldlsp;
 
-#if defined(sun)
+#ifdef illumos
 		newlsp = memalign(sizeof (uint64_t),
 		    g_nrecs_used * LS_TIME * (g_stkdepth + 1));
 #else
@@ -1664,7 +1662,7 @@ format_symbol(char *buf, uintptr_t addr,
 	else if (symoff == 0)
 		(void) sprintf(buf, "%s", symname);
 	else if (symoff < 16 && bcmp(symname, "cpu[", 4) == 0)	/* CPU+PIL */
-#if defined(sun)
+#ifdef illumos
 		(void) sprintf(buf, "%s+%ld", symname, (long)symoff);
 #else
 		(void) sprintf(buf, "%s+%s", symname, g_pri_class[(int)symoff]);

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/sym.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/lockstat/sym.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -42,12 +42,11 @@
 #include <libelf.h>
 #include <link.h>
 #include <elf.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 
 #include <kstat.h>
 #else
-/* FreeBSD */
 #include <sys/elf.h>
 #include <sys/ksyms.h>
 #include <sys/param.h>
@@ -66,7 +65,7 @@ static syment_t *symbol_table;
 static int nsyms, maxsyms;
 static char maxsymname[64];
 
-#if defined(sun)
+#ifdef illumos
 #ifdef _ELF64
 #define	elf_getshdr elf64_getshdr
 #else
@@ -105,7 +104,7 @@ remove_symbol(uintptr_t addr)
 			sep->addr = 0;
 }
 
-#if defined(sun)
+#ifdef illumos
 static void
 fake_up_certain_popular_kernel_symbols(void)
 {
@@ -133,8 +132,7 @@ fake_up_certain_popular_kernel_symbols(v
 	}
 	(void) kstat_close(kc);
 }
-#else
-/* FreeBSD */
+#else /* !illumos */
 static void
 fake_up_certain_popular_kernel_symbols(void)
 {
@@ -151,7 +149,7 @@ fake_up_certain_popular_kernel_symbols(v
 		add_symbol(name, addr, sizeof (uintptr_t));
 	}
 }
-#endif /* !defined(sun) */
+#endif /* illumos */
 
 static int
 symcmp(const void *p1, const void *p2)
@@ -177,12 +175,12 @@ symtab_init(void)
 	int		fd;
 	int		i;
 	int		strindex = -1;
-#if !defined(sun)
+#ifndef illumos
 	void		*ksyms;
 	size_t		sz;
 #endif
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) {
 		if (errno == ENOENT && modfind("ksyms") == -1) {
 			kldload("ksyms");
@@ -196,12 +194,11 @@ symtab_init(void)
 		return (-1);
 #endif
 
-#if defined(sun)
+#ifdef illumos
 	(void) elf_version(EV_CURRENT);
 
 	elf = elf_begin(fd, ELF_C_READ, NULL);
 #else
-	/* FreeBSD */
 	/* 
 	 * XXX - libelf needs to be fixed so it will work with
 	 * non 'ordinary' files like /dev/ksyms.  The following

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -40,7 +40,7 @@ die(char *format, ...)
 {
 	va_list ap;
 	int err = errno;
-#if !defined(sun)
+#ifndef illumos
 	const char *progname = getprogname();
 #endif
 
@@ -54,7 +54,7 @@ die(char *format, ...)
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", strerror(err));
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	exit(0);
 #else
 	exit(1);
@@ -65,7 +65,7 @@ void
 elfdie(char *format, ...)
 {
 	va_list ap;
-#if !defined(sun)
+#ifndef illumos
 	const char *progname = getprogname();
 #endif
 
@@ -79,7 +79,7 @@ elfdie(char *format, ...)
 	if (format[strlen(format) - 1] != '\n')
 		(void) fprintf(stderr, ": %s\n", elf_errmsg(elf_errno()));
 
-#if defined(__FreeBSD__)
+#ifndef illumos
 	exit(0);
 #else
 	exit(1);

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h	Tue Jan 20 22:33:27 2015	(r277451)
@@ -40,7 +40,7 @@ extern int findelfsecidx(Elf *, char *);
 extern void die(char *, ...);
 extern void elfdie(char *, ...);
 
-#if defined(sun)
+#ifdef illumos
 extern const char *progname;
 #endif
 

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -24,7 +24,7 @@
  * Use is subject to license terms.
  */
 
-#if defined(sun)
+#ifdef illumos
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #endif
 
@@ -505,7 +505,7 @@ getsym(struct ps_prochandle *P, uintptr_
 {
 	char name[256];
 	GElf_Sym sym;
-#if defined(sun)
+#ifdef illumos
 	prsyminfo_t info;
 #else
 	prmap_t *map;
@@ -518,7 +518,7 @@ getsym(struct ps_prochandle *P, uintptr_
 		(void) snprintf(buf, size, "%#lx", addr);
 		return (0);
 	}
-#if defined(sun)
+#ifdef illumos
 	if (info.prs_object == NULL)
 		info.prs_object = "<unknown>";
 
@@ -668,7 +668,7 @@ process_aggregate(const dtrace_aggdata_t
 static void
 prochandler(struct ps_prochandle *P, const char *msg, void *arg)
 {
-#if defined(sun)
+#ifdef illumos
 	const psinfo_t *prp = Ppsinfo(P);
 	int pid = Pstatus(P)->pr_pid;
 #else
@@ -773,7 +773,7 @@ intr(int signo)
 int
 main(int argc, char **argv)
 {
-#if defined(sun)
+#ifdef illumos
 	ucred_t *ucp;
 #endif
 	int err;
@@ -785,7 +785,7 @@ main(int argc, char **argv)
 
 	g_pname = basename(argv[0]);
 	argv[0] = g_pname; /* rewrite argv[0] for getopt errors */
-#if defined(sun)
+#ifdef illumos
 	/*
 	 * Make sure we have the required dtrace_proc privilege.
 	 */
@@ -988,7 +988,7 @@ main(int argc, char **argv)
 
 	if (opt_v)
 		(void) printf("%s: tracing enabled for pid %d\n", g_pname,
-#if defined(sun)
+#ifdef illumos
 		    (int)Pstatus(g_pr)->pr_pid);
 #else
 		    (int)proc_getpid(g_pr));

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/alist.h
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/alist.h	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/alist.h	Tue Jan 20 22:33:27 2015	(r277451)
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 #else
 #include <sys/elf.h>

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h	Tue Jan 20 22:33:27 2015	(r277451)
@@ -48,7 +48,7 @@ extern "C" {
 
 #ifndef	_ASM
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/machelf.h>
 #else
 #include <elf.h>

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -65,7 +65,7 @@
 #include <zfs_prop.h>
 #include <zfs_deleg.h>
 #include <libuutil.h>
-#ifdef sun
+#ifdef illumos
 #include <aclutils.h>
 #include <directory.h>
 #include <idmap.h>
@@ -2391,7 +2391,7 @@ userspace_cb(void *arg, const char *doma
 		/* SMB */
 		char sid[ZFS_MAXNAMELEN + 32];
 		uid_t id;
-#ifdef sun
+#ifdef illumos
 		int err;
 		int flag = IDMAP_REQ_FLG_USE_CACHE;
 #endif
@@ -2402,17 +2402,17 @@ userspace_cb(void *arg, const char *doma
 
 		if (prop == ZFS_PROP_GROUPUSED || prop == ZFS_PROP_GROUPQUOTA) {
 			type = USTYPE_SMB_GRP;
-#ifdef sun
+#ifdef illumos
 			err = sid_to_id(sid, B_FALSE, &id);
 #endif
 		} else {
 			type = USTYPE_SMB_USR;
-#ifdef sun
+#ifdef illumos
 			err = sid_to_id(sid, B_TRUE, &id);
 #endif
 		}
 
-#ifdef sun
+#ifdef illumos
 		if (err == 0) {
 			rid = id;
 			if (!cb->cb_sid2posix) {
@@ -6110,7 +6110,7 @@ unshare_unmount_path(int op, char *path,
 	/*
 	 * Search for the given (major,minor) pair in the mount table.
 	 */
-#ifdef sun
+#ifdef illumos
 	rewind(mnttab_file);
 	while ((ret = getextmntent(mnttab_file, &entry, 0)) == 0) {
 		if (entry.mnt_major == major(statbuf.st_dev) &&

Modified: projects/release-vmimage/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -112,7 +112,7 @@ vdev_error(const char *fmt, ...)
 	va_end(ap);
 }
 
-#ifdef sun
+#ifdef illumos
 static void
 libdiskmgt_error(int error)
 {
@@ -274,7 +274,7 @@ check_device(const char *path, boolean_t
 
 	return (check_slice(path, force, B_FALSE, isspare));
 }
-#endif	/* sun */
+#endif	/* illumos */
 
 /*
  * Check that a file is valid.  All we can do in this case is check that it's
@@ -290,7 +290,7 @@ check_file(const char *file, boolean_t f
 	pool_state_t state;
 	boolean_t inuse;
 
-#ifdef sun
+#ifdef illumos
 	if (dm_inuse_swap(file, &err)) {
 		if (err)
 			libdiskmgt_error(err);
@@ -377,7 +377,7 @@ check_device(const char *name, boolean_t
 static boolean_t
 is_whole_disk(const char *arg)
 {
-#ifdef sun
+#ifdef illumos
 	struct dk_gpt *label;
 	int	fd;
 	char	path[MAXPATHLEN];
@@ -915,7 +915,7 @@ check_replication(nvlist_t *config, nvli
 	return (ret);
 }
 
-#ifdef sun
+#ifdef illumos
 /*
  * Go through and find any whole disks in the vdev specification, labelling them
  * as appropriate.  When constructing the vdev spec, we were unable to open this
@@ -1019,7 +1019,7 @@ make_disks(zpool_handle_t *zhp, nvlist_t
 
 	return (0);
 }
-#endif	/* sun */
+#endif	/* illumos */
 
 /*
  * Determine if the given path is a hot spare within the given configuration.
@@ -1098,7 +1098,7 @@ is_device_in_use(nvlist_t *config, nvlis
 		 * regardless of what libdiskmgt or zpool_in_use() says.
 		 */
 		if (replacing) {
-#ifdef sun
+#ifdef illumos
 			if (nvlist_lookup_uint64(nv, ZPOOL_CONFIG_WHOLE_DISK,
 			    &wholedisk) == 0 && wholedisk)
 				(void) snprintf(buf, sizeof (buf), "%ss0",
@@ -1422,7 +1422,7 @@ split_mirror_vdev(zpool_handle_t *zhp, c
 			return (NULL);
 		}
 
-#ifdef sun
+#ifdef illumos
 		if (!flags.dryrun && make_disks(zhp, newroot) != 0) {
 			nvlist_free(newroot);
 			return (NULL);
@@ -1507,7 +1507,7 @@ make_root_vdev(zpool_handle_t *zhp, int 
 		return (NULL);
 	}
 
-#ifdef sun
+#ifdef illumos
 	/*
 	 * Run through the vdev specification and label any whole disks found.
 	 */

Modified: projects/release-vmimage/cddl/contrib/opensolaris/common/util/strtolctype.h
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/common/util/strtolctype.h	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/common/util/strtolctype.h	Tue Jan 20 22:33:27 2015	(r277451)
@@ -44,7 +44,7 @@ extern "C" {
  * safe in probe context.
  */
 
-#if defined(sun) &&	(defined(_KERNEL) || defined(_BOOT))
+#if defined(illumos) && (defined(_KERNEL) || defined(_BOOT))
 
 #define	isalnum(ch)	(isalpha(ch) || isdigit(ch))
 #define	isalpha(ch)	(isupper(ch) || islower(ch))

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -34,14 +34,14 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
-#if defined(sun)
+#ifdef illumos
 #include <dlfcn.h>
 #else
 #include <zlib.h>
 #endif
 #include <gelf.h>
 
-#if defined(sun)
+#ifdef illumos
 #ifdef _LP64
 static const char *_libctf_zlib = "/usr/lib/64/libz.so";
 #else
@@ -58,7 +58,7 @@ static struct {
 static size_t _PAGESIZE;
 static size_t _PAGEMASK;
 
-#if defined(sun)
+#ifdef illumos
 #pragma init(_libctf_init)
 #else
 void    _libctf_init(void) __attribute__ ((constructor));
@@ -66,7 +66,7 @@ void    _libctf_init(void) __attribute__
 void
 _libctf_init(void)
 {
-#if defined(sun)
+#ifdef illumos
 	const char *p = getenv("LIBCTF_DECOMPRESSOR");
 
 	if (p != NULL)
@@ -87,7 +87,7 @@ _libctf_init(void)
 void *
 ctf_zopen(int *errp)
 {
-#if defined(sun)
+#ifdef illumos
 	ctf_dprintf("decompressing CTF data using %s\n", _libctf_zlib);
 
 	if (zlib.z_dlp != NULL)

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -56,13 +56,13 @@
  */
 
 static const char *devnamep = "/dev/dtrace/helper";
-#if defined(sun)
+#ifdef illumos
 static const char *olddevname = "/devices/pseudo/dtrace at 0:helper";
 #endif
 
 static const char *modname;	/* Name of this load object */
 static int gen;			/* DOF helper generation */
-#if defined(sun)
+#ifdef illumos
 extern dof_hdr_t __SUNW_dof;	/* DOF defined in the .SUNW_dof section */
 #endif
 static boolean_t dof_init_debug = B_FALSE;	/* From DTRACE_DOF_INIT_DEBUG */
@@ -90,7 +90,7 @@ dprintf(int debug, const char *fmt, ...)
 	va_end(ap);
 }
 
-#if defined(sun)
+#ifdef illumos
 #pragma init(dtrace_dof_init)
 #else
 static void dtrace_dof_init(void) __attribute__ ((constructor));
@@ -99,7 +99,7 @@ static void dtrace_dof_init(void) __attr
 static void
 dtrace_dof_init(void)
 {
-#if defined(sun)
+#ifdef illumos
 	dof_hdr_t *dof = &__SUNW_dof;
 #else
 	dof_hdr_t *dof = NULL;
@@ -111,14 +111,14 @@ dtrace_dof_init(void)
 #endif
 	dof_helper_t dh;
 	Link_map *lmp = NULL;
-#if defined(sun)
+#ifdef illumos
 	Lmid_t lmid;
 #else
 	u_long lmid = 0;
 #endif
 	int fd;
 	const char *p;
-#if !defined(sun)
+#ifndef illumos
 	Elf *e;
 	Elf_Scn *scn = NULL;
 	Elf_Data *dofdata = NULL;
@@ -141,7 +141,7 @@ dtrace_dof_init(void)
 		return;
 	}
 
-#if defined(sun)
+#ifdef illumos
 	if (dlinfo(RTLD_SELF, RTLD_DI_LMID, &lmid) == -1) {
 		dprintf(1, "couldn't discover link map ID\n");
 		return;
@@ -152,7 +152,7 @@ dtrace_dof_init(void)
 		modname = lmp->l_name;
 	else
 		modname++;
-#if !defined(sun)
+#ifndef illumos
 	elf_version(EV_CURRENT);
 	if ((efd = open(lmp->l_name, O_RDONLY, 0)) < 0) {
 		dprintf(1, "couldn't open file for reading\n");
@@ -215,7 +215,7 @@ dtrace_dof_init(void)
 
 	if ((fd = open64(devnamep, O_RDWR)) < 0) {
 		dprintf(1, "failed to open helper device %s", devnamep);
-#if defined(sun)
+#ifdef illumos
 		/*
 		 * If the device path wasn't explicitly set, try again with
 		 * the old device path.
@@ -237,14 +237,14 @@ dtrace_dof_init(void)
 		dprintf(1, "DTrace ioctl failed for DOF at %p", dof);
 	else {
 		dprintf(1, "DTrace ioctl succeeded for DOF at %p\n", dof);
-#if !defined(sun)
+#ifndef illumos
 		gen = dh.gen;
 #endif
 	}
 
 	(void) close(fd);
 
-#if !defined(sun)
+#ifndef illumos
 		/* End of while loop */
 		dof = dof_next;
 	}
@@ -254,7 +254,7 @@ dtrace_dof_init(void)
 #endif
 }
 
-#if defined(sun)
+#ifdef illumos
 #pragma fini(dtrace_dof_fini)
 #else
 static void dtrace_dof_fini(void) __attribute__ ((destructor));

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -35,7 +35,7 @@
 #include <unistd.h>
 #include <dt_impl.h>
 #include <assert.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #else
 #include <sys/sysctl.h>
@@ -453,7 +453,7 @@ dt_aggregate_snap_cpu(dtrace_hdl_t *dtp,
 
 	buf->dtbd_cpu = cpu;
 
-#if defined(sun)
+#ifdef illumos
 	if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, buf) == -1) {
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_AGGSNAP, &buf) == -1) {

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -1888,7 +1888,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	char **argv = malloc(sizeof (char *) * (argc + 5));
 	FILE *ofp = tmpfile();
 
-#if defined(sun)
+#ifdef illumos
 	char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */
 #endif
 	char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */
@@ -1898,7 +1898,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 
 	int wstat, estat;
 	pid_t pid;
-#if defined(sun)
+#ifdef illumos
 	off64_t off;
 #else
 	off_t off = 0;
@@ -1929,7 +1929,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 		(void) fseeko64(ifp, off, SEEK_SET);
 	}
 
-#if defined(sun)
+#ifdef illumos
 	(void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp));
 	(void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp));
 #endif
@@ -1940,7 +1940,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	    "-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax);
 	argv[argc++] = verdef;
 
-#if defined(sun)
+#ifdef illumos
 	switch (dtp->dt_stdcmode) {
 	case DT_STDC_XA:
 	case DT_STDC_XT:
@@ -1982,7 +1982,7 @@ dt_preproc(dtrace_hdl_t *dtp, FILE *ifp)
 	}
 
 	if (pid == 0) {
-#if !defined(sun)
+#ifndef illumos
 		if (isatty(fileno(ifp)) == 0)
 			lseek(fileno(ifp), off, SEEK_SET);
 		dup2(fileno(ifp), 0);

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -35,12 +35,12 @@
 #include <limits.h>
 #include <assert.h>
 #include <ctype.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <dt_impl.h>
 #include <dt_pq.h>
-#if !defined(sun)
+#ifndef illumos
 #include <libproc_compat.h>
 #endif
 
@@ -2958,7 +2958,7 @@ dt_get_buf(dtrace_hdl_t *dtp, int cpu, d
 	buf->dtbd_size = size;
 	buf->dtbd_cpu = cpu;
 
-#if defined(sun)
+#ifdef illumos
 	if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) {
 #else
 	if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -26,12 +26,12 @@
  */
 
 #include <sys/types.h>
-#if defined(sun)
+#ifdef illumos
 #include <sys/sysmacros.h>
 #endif
 
 #include <strings.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 #include <assert.h>

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -145,7 +145,7 @@ dtrace_errno(dtrace_hdl_t *dtp)
 	return (dtp->dt_errno);
 }
 
-#if defined(sun)
+#ifdef illumos
 int
 dt_set_errno(dtrace_hdl_t *dtp, int err)
 {

Modified: projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
==============================================================================
--- projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Tue Jan 20 22:31:26 2015	(r277450)
+++ projects/release-vmimage/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c	Tue Jan 20 22:33:27 2015	(r277451)
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <assert.h>
-#if defined(sun)
+#ifdef illumos
 #include <alloca.h>
 #endif
 

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