svn commit: r260917 - in projects/altix2: . bin/cat bin/df bin/pax/tests bin/sh bin/sh/tests bin/test/tests cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolari...

Marcel Moolenaar marcel at FreeBSD.org
Mon Jan 20 18:59:12 UTC 2014 

Author: marcel
Date: Mon Jan 20 18:59:07 2014
New Revision: 260917
URL: http://svnweb.freebsd.org/changeset/base/260917

Log:
  Merge ^/head at 260914.

Added:
  projects/altix2/bin/pax/tests/legacy_test.pl
     - copied unchanged from r260914, head/bin/pax/tests/legacy_test.pl
  projects/altix2/contrib/atf/atf-c++/atf-c++.pc.in
     - copied unchanged from r260914, head/contrib/atf/atf-c++/atf-c++.pc.in
  projects/altix2/contrib/atf/atf-c/atf-c.pc.in
     - copied unchanged from r260914, head/contrib/atf/atf-c/atf-c.pc.in
  projects/altix2/contrib/atf/atf-sh/atf-sh.pc.in
     - copied unchanged from r260914, head/contrib/atf/atf-sh/atf-sh.pc.in
  projects/altix2/lib/atf/common.mk
     - copied unchanged from r260914, head/lib/atf/common.mk
  projects/altix2/lib/atf/libatf-c++/tests/Makefile.inc
     - copied unchanged from r260914, head/lib/atf/libatf-c++/tests/Makefile.inc
  projects/altix2/lib/atf/libatf-c++/tests/detail/
     - copied from r260914, head/lib/atf/libatf-c++/tests/detail/
  projects/altix2/lib/atf/libatf-c/tests/Makefile.inc
     - copied unchanged from r260914, head/lib/atf/libatf-c/tests/Makefile.inc
  projects/altix2/lib/atf/libatf-c/tests/detail/
     - copied from r260914, head/lib/atf/libatf-c/tests/detail/
  projects/altix2/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
     - copied unchanged from r260914, head/release/doc/en_US.ISO8859-1/share/xml/catalog.xml
  projects/altix2/release/doc/en_US.ISO8859-1/share/xml/release.xsl
     - copied unchanged from r260914, head/release/doc/en_US.ISO8859-1/share/xml/release.xsl
  projects/altix2/release/doc/share/xml/release.xsl
     - copied unchanged from r260914, head/release/doc/share/xml/release.xsl
  projects/altix2/release/pkg_repos/
     - copied from r260914, head/release/pkg_repos/
  projects/altix2/share/man/man4/geom_uncompress.4
     - copied unchanged from r260914, head/share/man/man4/geom_uncompress.4
  projects/altix2/share/man/man4/virtio_random.4
     - copied unchanged from r260914, head/share/man/man4/virtio_random.4
  projects/altix2/sys/amd64/conf/VT
     - copied unchanged from r260914, head/sys/amd64/conf/VT
  projects/altix2/sys/arm/at91/at91_gpio.h
     - copied unchanged from r260914, head/sys/arm/at91/at91_gpio.h
  projects/altix2/sys/arm/at91/at91_smc.c
     - copied unchanged from r260914, head/sys/arm/at91/at91_smc.c
  projects/altix2/sys/arm/at91/at91_smc.h
     - copied unchanged from r260914, head/sys/arm/at91/at91_smc.h
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
     - copied unchanged from r260914, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h
     - copied unchanged from r260914, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_bookmark.h
  projects/altix2/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
     - copied unchanged from r260914, head/sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
  projects/altix2/sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
     - copied unchanged from r260914, head/sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
  projects/altix2/sys/dev/aic7xxx/aic79xx_reg.h
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic79xx_reg.h
  projects/altix2/sys/dev/aic7xxx/aic79xx_reg_print.c
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic79xx_reg_print.c
  projects/altix2/sys/dev/aic7xxx/aic79xx_seq.h
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic79xx_seq.h
  projects/altix2/sys/dev/aic7xxx/aic7xxx_reg.h
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic7xxx_reg.h
  projects/altix2/sys/dev/aic7xxx/aic7xxx_reg_print.c
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic7xxx_reg_print.c
  projects/altix2/sys/dev/aic7xxx/aic7xxx_seq.h
     - copied unchanged from r260914, head/sys/dev/aic7xxx/aic7xxx_seq.h
  projects/altix2/sys/dev/nand/nfc_at91.h
     - copied unchanged from r260914, head/sys/dev/nand/nfc_at91.h
  projects/altix2/sys/dev/virtio/random/
     - copied from r260914, head/sys/dev/virtio/random/
  projects/altix2/sys/i386/conf/VT
     - copied unchanged from r260914, head/sys/i386/conf/VT
  projects/altix2/sys/modules/iwnfw/iwn105/
     - copied from r260914, head/sys/modules/iwnfw/iwn105/
  projects/altix2/sys/modules/iwnfw/iwn135/
     - copied from r260914, head/sys/modules/iwnfw/iwn135/
  projects/altix2/sys/modules/virtio/random/
     - copied from r260914, head/sys/modules/virtio/random/
  projects/altix2/sys/sys/sf_base.h
     - copied unchanged from r260914, head/sys/sys/sf_base.h
Deleted:
  projects/altix2/bin/pax/tests/legacy_test.sh
  projects/altix2/release/amd64/pkg-stage.conf
  projects/altix2/release/doc/de_DE.ISO8859-1/
  projects/altix2/release/doc/en_US.ISO8859-1/share/xml/catalog
  projects/altix2/release/doc/en_US.ISO8859-1/share/xml/release.dsl
  projects/altix2/release/doc/fr_FR.ISO8859-1/
  projects/altix2/release/doc/ja_JP.eucJP/
  projects/altix2/release/doc/ru_RU.KOI8-R/
  projects/altix2/release/doc/share/xml/catalog
  projects/altix2/release/doc/share/xml/default.dsl
  projects/altix2/release/doc/share/xml/release.dsl
  projects/altix2/release/doc/zh_CN.GB2312/
  projects/altix2/release/i386/pkg-stage.conf
  projects/altix2/sys/arm/tegra/bus_space.c
  projects/altix2/sys/dev/fdt/fdt_pci.c
  projects/altix2/sys/powerpc/include/fdt.h
Modified:
  projects/altix2/Makefile.inc1
  projects/altix2/UPDATING
  projects/altix2/bin/cat/cat.c
  projects/altix2/bin/df/df.1
  projects/altix2/bin/pax/tests/Makefile
  projects/altix2/bin/sh/input.c
  projects/altix2/bin/sh/sh.1
  projects/altix2/bin/sh/tests/Makefile
  projects/altix2/bin/sh/trap.c
  projects/altix2/bin/sh/trap.h
  projects/altix2/bin/test/tests/Makefile
  projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
  projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/altix2/cddl/contrib/opensolaris/cmd/zinject/zinject.c
  projects/altix2/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/altix2/cddl/contrib/opensolaris/lib/pyzfs/common/allow.py
  projects/altix2/cddl/usr.bin/zinject/Makefile
  projects/altix2/contrib/atf/FREEBSD-Xlist
  projects/altix2/contrib/atf/atf-c++/detail/test_helpers.cpp
  projects/altix2/contrib/bsnmp/lib/snmpagent.c
  projects/altix2/contrib/byacc/CHANGES
  projects/altix2/contrib/byacc/VERSION
  projects/altix2/contrib/byacc/aclocal.m4
  projects/altix2/contrib/byacc/config.guess
  projects/altix2/contrib/byacc/config.sub
  projects/altix2/contrib/byacc/configure
  projects/altix2/contrib/byacc/configure.in
  projects/altix2/contrib/byacc/defs.h
  projects/altix2/contrib/byacc/main.c
  projects/altix2/contrib/byacc/makefile.in
  projects/altix2/contrib/byacc/output.c
  projects/altix2/contrib/byacc/package/byacc.spec
  projects/altix2/contrib/byacc/package/debian/changelog
  projects/altix2/contrib/byacc/reader.c
  projects/altix2/contrib/byacc/skeleton.c
  projects/altix2/contrib/byacc/test/calc.tab.c
  projects/altix2/contrib/byacc/test/calc1.tab.c
  projects/altix2/contrib/byacc/test/calc2.tab.c
  projects/altix2/contrib/byacc/test/calc3.tab.c
  projects/altix2/contrib/byacc/test/code_calc.code.c
  projects/altix2/contrib/byacc/test/code_calc.tab.c
  projects/altix2/contrib/byacc/test/code_error.code.c
  projects/altix2/contrib/byacc/test/code_error.tab.c
  projects/altix2/contrib/byacc/test/error.tab.c
  projects/altix2/contrib/byacc/test/ftp.tab.c
  projects/altix2/contrib/byacc/test/grammar.tab.c
  projects/altix2/contrib/byacc/test/pure_calc.tab.c
  projects/altix2/contrib/byacc/test/pure_error.tab.c
  projects/altix2/contrib/byacc/test/quote_calc-s.tab.c
  projects/altix2/contrib/byacc/test/quote_calc.tab.c
  projects/altix2/contrib/byacc/test/quote_calc2-s.tab.c
  projects/altix2/contrib/byacc/test/quote_calc2.tab.c
  projects/altix2/contrib/byacc/test/quote_calc3-s.tab.c
  projects/altix2/contrib/byacc/test/quote_calc3.tab.c
  projects/altix2/contrib/byacc/test/quote_calc4-s.tab.c
  projects/altix2/contrib/byacc/test/quote_calc4.tab.c
  projects/altix2/contrib/byacc/yacc.1
  projects/altix2/contrib/diff/man/diff3.1
  projects/altix2/contrib/gcc/ChangeLog.apple
  projects/altix2/contrib/gcc/ChangeLog.gcc43
  projects/altix2/contrib/gcc/attribs.c
  projects/altix2/contrib/gcc/c-common.c
  projects/altix2/contrib/gcc/c-common.h
  projects/altix2/contrib/gcc/c-convert.c
  projects/altix2/contrib/gcc/c-cppbuiltin.c
  projects/altix2/contrib/gcc/c-decl.c
  projects/altix2/contrib/gcc/c-objc-common.h
  projects/altix2/contrib/gcc/c-opts.c
  projects/altix2/contrib/gcc/c-parser.c
  projects/altix2/contrib/gcc/c-pretty-print.c
  projects/altix2/contrib/gcc/c-pretty-print.h
  projects/altix2/contrib/gcc/c-tree.h
  projects/altix2/contrib/gcc/c-typeck.c
  projects/altix2/contrib/gcc/c.opt
  projects/altix2/contrib/gcc/calls.c
  projects/altix2/contrib/gcc/cgraph.h
  projects/altix2/contrib/gcc/cgraphunit.c
  projects/altix2/contrib/gcc/combine.c
  projects/altix2/contrib/gcc/config/arm/freebsd.h
  projects/altix2/contrib/gcc/config/darwin.h
  projects/altix2/contrib/gcc/convert.c
  projects/altix2/contrib/gcc/convert.h
  projects/altix2/contrib/gcc/cp/ChangeLog
  projects/altix2/contrib/gcc/cp/ChangeLog.apple
  projects/altix2/contrib/gcc/cp/ChangeLog.gcc43
  projects/altix2/contrib/gcc/cp/call.c
  projects/altix2/contrib/gcc/cp/class.c
  projects/altix2/contrib/gcc/cp/cp-gimplify.c
  projects/altix2/contrib/gcc/cp/cp-objcp-common.c
  projects/altix2/contrib/gcc/cp/cp-objcp-common.h
  projects/altix2/contrib/gcc/cp/cp-tree.h
  projects/altix2/contrib/gcc/cp/decl.c
  projects/altix2/contrib/gcc/cp/decl.h
  projects/altix2/contrib/gcc/cp/decl2.c
  projects/altix2/contrib/gcc/cp/error.c
  projects/altix2/contrib/gcc/cp/g++spec.c
  projects/altix2/contrib/gcc/cp/init.c
  projects/altix2/contrib/gcc/cp/mangle.c
  projects/altix2/contrib/gcc/cp/name-lookup.c
  projects/altix2/contrib/gcc/cp/name-lookup.h
  projects/altix2/contrib/gcc/cp/parser.c
  projects/altix2/contrib/gcc/cp/pt.c
  projects/altix2/contrib/gcc/cp/semantics.c
  projects/altix2/contrib/gcc/cp/tree.c
  projects/altix2/contrib/gcc/cp/typeck.c
  projects/altix2/contrib/gcc/dbxout.c
  projects/altix2/contrib/gcc/doc/extend.texi
  projects/altix2/contrib/gcc/doc/invoke.texi
  projects/altix2/contrib/gcc/dwarf2.h
  projects/altix2/contrib/gcc/dwarf2out.c
  projects/altix2/contrib/gcc/expmed.c
  projects/altix2/contrib/gcc/expr.c
  projects/altix2/contrib/gcc/fold-const.c
  projects/altix2/contrib/gcc/function.c
  projects/altix2/contrib/gcc/function.h
  projects/altix2/contrib/gcc/ggc-common.c
  projects/altix2/contrib/gcc/ggc.h
  projects/altix2/contrib/gcc/langhooks-def.h
  projects/altix2/contrib/gcc/langhooks.c
  projects/altix2/contrib/gcc/langhooks.h
  projects/altix2/contrib/gcc/libgcc2.c
  projects/altix2/contrib/gcc/libgcc2.h
  projects/altix2/contrib/gcc/loop-init.c
  projects/altix2/contrib/gcc/stor-layout.c
  projects/altix2/contrib/gcc/stub-objc.c
  projects/altix2/contrib/gcc/targhooks.c
  projects/altix2/contrib/gcc/toplev.c
  projects/altix2/contrib/gcc/tree-gimple.h
  projects/altix2/contrib/gcc/tree-nested.c
  projects/altix2/contrib/gcc/tree-ssa-address.c
  projects/altix2/contrib/gcc/tree.c
  projects/altix2/contrib/gcc/tree.def
  projects/altix2/contrib/gcc/tree.h
  projects/altix2/contrib/gcc/varasm.c
  projects/altix2/contrib/gcclibs/include/libiberty.h
  projects/altix2/contrib/gcclibs/libcpp/ChangeLog.apple
  projects/altix2/contrib/gcclibs/libcpp/charset.c
  projects/altix2/contrib/gcclibs/libcpp/directives.c
  projects/altix2/contrib/gcclibs/libcpp/internal.h
  projects/altix2/contrib/gcclibs/libcpp/lex.c
  projects/altix2/contrib/gcclibs/libiberty/physmem.c
  projects/altix2/contrib/gperf/doc/gperf.1
  projects/altix2/contrib/gperf/src/options.cc
  projects/altix2/contrib/gperf/src/options.h
  projects/altix2/contrib/gperf/src/options.icc
  projects/altix2/contrib/gperf/src/output.cc
  projects/altix2/contrib/libpcap/ieee80211.h
  projects/altix2/contrib/ntp/ntpd/ntp_config.c
  projects/altix2/crypto/openssl/ssl/d1_both.c
  projects/altix2/crypto/openssl/ssl/s3_both.c
  projects/altix2/crypto/openssl/ssl/s3_lib.c
  projects/altix2/crypto/openssl/ssl/ssl_locl.h
  projects/altix2/crypto/openssl/ssl/t1_enc.c
  projects/altix2/etc/defaults/rc.conf
  projects/altix2/etc/devd/usb.conf
  projects/altix2/etc/mtree/BSD.tests.dist
  projects/altix2/gnu/lib/libgcc/Makefile
  projects/altix2/gnu/usr.bin/gdb/kgdb/trgt.c
  projects/altix2/include/ttyent.h
  projects/altix2/lib/atf/Makefile.inc
  projects/altix2/lib/atf/libatf-c++/Makefile
  projects/altix2/lib/atf/libatf-c++/tests/Makefile
  projects/altix2/lib/atf/libatf-c/Makefile
  projects/altix2/lib/atf/libatf-c/tests/Makefile
  projects/altix2/lib/libc/Makefile
  projects/altix2/lib/libc/gen/fts.3
  projects/altix2/lib/libc/gen/fts.c
  projects/altix2/lib/libc/gen/getttyent.c
  projects/altix2/lib/libc/include/port_before.h
  projects/altix2/lib/libc/net/sctp_sys_calls.c
  projects/altix2/lib/libc/resolv/res_send.c
  projects/altix2/lib/libc/stdlib/getsubopt.c
  projects/altix2/lib/libc/sys/accept.2
  projects/altix2/lib/libc/sys/chflags.2
  projects/altix2/lib/libc/sys/pipe.2
  projects/altix2/lib/libcasper/libcasper.c
  projects/altix2/lib/libcxxrt/Version.map
  projects/altix2/lib/libfetch/common.c
  projects/altix2/lib/libiconv/Makefile
  projects/altix2/lib/libiconv_modules/BIG5/Makefile
  projects/altix2/lib/libiconv_modules/EUC/Makefile
  projects/altix2/lib/libiconv_modules/EUCTW/Makefile
  projects/altix2/lib/libiconv_modules/GBK2K/Makefile
  projects/altix2/lib/libiconv_modules/ISO2022/Makefile
  projects/altix2/lib/libiconv_modules/JOHAB/Makefile
  projects/altix2/lib/libiconv_modules/UES/Makefile
  projects/altix2/lib/libiconv_modules/UTF1632/Makefile
  projects/altix2/lib/libiconv_modules/UTF7/Makefile
  projects/altix2/lib/libiconv_modules/iconv_std/Makefile
  projects/altix2/lib/libiconv_modules/mapper_parallel/Makefile
  projects/altix2/lib/libiconv_modules/mapper_serial/Makefile
  projects/altix2/lib/libiconv_modules/mapper_std/Makefile
  projects/altix2/lib/libiconv_modules/mapper_zone/Makefile
  projects/altix2/lib/libkvm/Makefile
  projects/altix2/lib/libkvm/kvm_ia64.c
  projects/altix2/lib/libmd/sha256.h
  projects/altix2/lib/libmd/sha256c.c
  projects/altix2/lib/libnetgraph/sock.c
  projects/altix2/lib/libnv/nvlist.c
  projects/altix2/lib/libusb/Makefile
  projects/altix2/lib/libusb/libusb.3
  projects/altix2/lib/libusb/libusb.h
  projects/altix2/lib/libusb/libusb10_io.c
  projects/altix2/libexec/getty/ttys.5
  projects/altix2/libexec/rtld-elf/Makefile
  projects/altix2/release/Makefile
  projects/altix2/release/doc/en_US.ISO8859-1/errata/article.xml
  projects/altix2/release/doc/en_US.ISO8859-1/relnotes/article.xml
  projects/altix2/release/doc/share/mk/doc.relnotes.mk
  projects/altix2/release/doc/share/xml/catalog.xml
  projects/altix2/release/picobsd/build/picobsd
  projects/altix2/release/scripts/pkg-stage.sh
  projects/altix2/sbin/camcontrol/camcontrol.c
  projects/altix2/sbin/casperd/casperd.c
  projects/altix2/sbin/geom/class/eli/geom_eli.c
  projects/altix2/sbin/geom/class/part/geom_part.c   (contents, props changed)
  projects/altix2/sbin/kldload/kldload.c
  projects/altix2/sbin/nvmecontrol/devlist.c
  projects/altix2/sbin/route/keywords
  projects/altix2/sbin/route/route.8
  projects/altix2/sbin/route/route.c
  projects/altix2/share/i18n/esdb/UTF/UTF.alias
  projects/altix2/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
  projects/altix2/share/man/man4/Makefile
  projects/altix2/share/man/man4/kld.4
  projects/altix2/share/man/man4/netmap.4
  projects/altix2/share/man/man4/run.4
  projects/altix2/share/man/man9/Makefile
  projects/altix2/share/man/man9/ieee80211_crypto.9
  projects/altix2/share/man/man9/malloc.9
  projects/altix2/share/man/man9/mbuf.9
  projects/altix2/share/man/man9/sglist.9
  projects/altix2/share/misc/committers-ports.dot
  projects/altix2/share/mk/bsd.libnames.mk
  projects/altix2/share/mk/bsd.sys.mk
  projects/altix2/share/mk/bsd.test.mk
  projects/altix2/share/mk/tap.test.mk
  projects/altix2/sys/amd64/amd64/identcpu.c
  projects/altix2/sys/amd64/amd64/pmap.c
  projects/altix2/sys/amd64/conf/NOTES
  projects/altix2/sys/amd64/include/vmm.h   (contents, props changed)
  projects/altix2/sys/amd64/vmm/amd/amdv.c
  projects/altix2/sys/amd64/vmm/intel/ept.c
  projects/altix2/sys/amd64/vmm/intel/ept.h
  projects/altix2/sys/amd64/vmm/intel/vmcs.c
  projects/altix2/sys/amd64/vmm/intel/vmcs.h
  projects/altix2/sys/amd64/vmm/intel/vmx.c
  projects/altix2/sys/amd64/vmm/intel/vmx.h
  projects/altix2/sys/amd64/vmm/intel/vmx_controls.h
  projects/altix2/sys/amd64/vmm/intel/vmx_genassym.c
  projects/altix2/sys/amd64/vmm/intel/vmx_support.S
  projects/altix2/sys/amd64/vmm/io/vhpet.c
  projects/altix2/sys/amd64/vmm/io/vioapic.c
  projects/altix2/sys/amd64/vmm/io/vlapic.c
  projects/altix2/sys/amd64/vmm/io/vlapic.h
  projects/altix2/sys/amd64/vmm/io/vlapic_priv.h
  projects/altix2/sys/amd64/vmm/vmm.c
  projects/altix2/sys/amd64/vmm/vmm_ipi.c
  projects/altix2/sys/amd64/vmm/vmm_ipi.h
  projects/altix2/sys/amd64/vmm/vmm_lapic.c
  projects/altix2/sys/amd64/vmm/vmm_stat.c
  projects/altix2/sys/amd64/vmm/vmm_stat.h
  projects/altix2/sys/arm/allwinner/a10_machdep.c
  projects/altix2/sys/arm/arm/bus_space_generic.c
  projects/altix2/sys/arm/arm/devmap.c
  projects/altix2/sys/arm/arm/machdep.c
  projects/altix2/sys/arm/arm/nexus.c
  projects/altix2/sys/arm/arm/trap.c
  projects/altix2/sys/arm/at91/at91rm9200.c
  projects/altix2/sys/arm/at91/at91sam9260.c
  projects/altix2/sys/arm/at91/at91sam9g20.c
  projects/altix2/sys/arm/at91/at91sam9g45.c
  projects/altix2/sys/arm/at91/at91sam9x5.c
  projects/altix2/sys/arm/at91/at91var.h
  projects/altix2/sys/arm/at91/board_hl201.c
  projects/altix2/sys/arm/at91/board_sam9260ek.c
  projects/altix2/sys/arm/at91/files.at91
  projects/altix2/sys/arm/at91/uart_dev_at91usart.c
  projects/altix2/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
  projects/altix2/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/altix2/sys/arm/conf/AC100
  projects/altix2/sys/arm/conf/ARMADAXP
  projects/altix2/sys/arm/conf/ARNDALE
  projects/altix2/sys/arm/conf/ATMEL
  projects/altix2/sys/arm/conf/AVILA
  projects/altix2/sys/arm/conf/BWCT
  projects/altix2/sys/arm/conf/CAMBRIA
  projects/altix2/sys/arm/conf/CNS11XXNAS
  projects/altix2/sys/arm/conf/COSMIC
  projects/altix2/sys/arm/conf/CUBIEBOARD
  projects/altix2/sys/arm/conf/CUBIEBOARD2
  projects/altix2/sys/arm/conf/DB-78XXX
  projects/altix2/sys/arm/conf/DB-88F5XXX
  projects/altix2/sys/arm/conf/DB-88F6XXX
  projects/altix2/sys/arm/conf/DIGI-CCWMX53
  projects/altix2/sys/arm/conf/DOCKSTAR
  projects/altix2/sys/arm/conf/EA3250
  projects/altix2/sys/arm/conf/EB9200
  projects/altix2/sys/arm/conf/EFIKA_MX
  projects/altix2/sys/arm/conf/ETHERNUT5
  projects/altix2/sys/arm/conf/HL200
  projects/altix2/sys/arm/conf/HL201
  projects/altix2/sys/arm/conf/IMX53-QSB
  projects/altix2/sys/arm/conf/KB920X
  projects/altix2/sys/arm/conf/LN2410SBC
  projects/altix2/sys/arm/conf/NSLU
  projects/altix2/sys/arm/conf/PANDABOARD
  projects/altix2/sys/arm/conf/QILA9G20
  projects/altix2/sys/arm/conf/RADXA
  projects/altix2/sys/arm/conf/RPI-B
  projects/altix2/sys/arm/conf/SAM9260EK
  projects/altix2/sys/arm/conf/SAM9G20EK
  projects/altix2/sys/arm/conf/SAM9X25EK
  projects/altix2/sys/arm/conf/SHEEVAPLUG
  projects/altix2/sys/arm/conf/SN9G45
  projects/altix2/sys/arm/conf/TS7800
  projects/altix2/sys/arm/conf/ZEDBOARD
  projects/altix2/sys/arm/freescale/imx/imx51_ipuv3.c
  projects/altix2/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
  projects/altix2/sys/arm/include/devmap.h
  projects/altix2/sys/arm/include/fdt.h
  projects/altix2/sys/arm/include/intr.h
  projects/altix2/sys/arm/include/ofw_machdep.h
  projects/altix2/sys/arm/include/psl.h
  projects/altix2/sys/arm/lpc/lpc_gpio.c
  projects/altix2/sys/arm/lpc/lpc_machdep.c
  projects/altix2/sys/arm/lpc/lpc_mmc.c
  projects/altix2/sys/arm/lpc/lpcreg.h
  projects/altix2/sys/arm/mv/mv_machdep.c
  projects/altix2/sys/arm/mv/mv_pci.c
  projects/altix2/sys/arm/mv/mvvar.h
  projects/altix2/sys/arm/s3c2xx0/uart_dev_s3c2410.c
  projects/altix2/sys/arm/sa11x0/uart_dev_sa1110.c
  projects/altix2/sys/arm/tegra/files.tegra2
  projects/altix2/sys/arm/tegra/tegra2_machdep.c
  projects/altix2/sys/arm/ti/am335x/am335x_dmtimer.c
  projects/altix2/sys/arm/ti/ti_machdep.c
  projects/altix2/sys/arm/xilinx/uart_dev_cdnc.c
  projects/altix2/sys/boot/fdt/dts/cubieboard.dts
  projects/altix2/sys/boot/fdt/dts/cubieboard2.dts
  projects/altix2/sys/boot/fdt/dts/dockstar.dts
  projects/altix2/sys/boot/i386/boot2/Makefile
  projects/altix2/sys/boot/i386/gptboot/Makefile
  projects/altix2/sys/boot/i386/gptzfsboot/Makefile
  projects/altix2/sys/boot/i386/zfsboot/Makefile
  projects/altix2/sys/boot/pc98/boot2/Makefile
  projects/altix2/sys/cam/cam_debug.h
  projects/altix2/sys/cam/cam_periph.c
  projects/altix2/sys/cam/cam_periph.h
  projects/altix2/sys/cam/cam_xpt.c
  projects/altix2/sys/cam/scsi/scsi_da.c
  projects/altix2/sys/cam/scsi/scsi_low.c
  projects/altix2/sys/cam/scsi/scsi_xpt.c
  projects/altix2/sys/cddl/compat/opensolaris/sys/time.h
  projects/altix2/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h
  projects/altix2/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/altix2/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/altix2/sys/compat/freebsd32/freebsd32_misc.c
  projects/altix2/sys/conf/Makefile.arm
  projects/altix2/sys/conf/files
  projects/altix2/sys/conf/files.amd64
  projects/altix2/sys/conf/files.i386
  projects/altix2/sys/conf/options
  projects/altix2/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/altix2/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c   (contents, props changed)
  projects/altix2/sys/dev/aacraid/aacraid.c
  projects/altix2/sys/dev/aha/aha.c
  projects/altix2/sys/dev/ahci/ahci.c
  projects/altix2/sys/dev/ale/if_ale.c
  projects/altix2/sys/dev/altera/atse/if_atse.c
  projects/altix2/sys/dev/ath/if_ath_rx_edma.c
  projects/altix2/sys/dev/ath/if_ath_tx.c
  projects/altix2/sys/dev/bwi/if_bwi.c
  projects/altix2/sys/dev/bwn/if_bwn.c
  projects/altix2/sys/dev/bxe/bxe.c
  projects/altix2/sys/dev/bxe/ecore_hsi.h
  projects/altix2/sys/dev/cxgbe/adapter.h
  projects/altix2/sys/dev/cxgbe/t4_main.c
  projects/altix2/sys/dev/cxgbe/t4_sge.c
  projects/altix2/sys/dev/e1000/if_em.c
  projects/altix2/sys/dev/e1000/if_igb.c
  projects/altix2/sys/dev/e1000/if_lem.c
  projects/altix2/sys/dev/fdt/fdt_common.c
  projects/altix2/sys/dev/fdt/fdt_common.h
  projects/altix2/sys/dev/fdt/fdt_mips.c
  projects/altix2/sys/dev/fdt/fdt_powerpc.c
  projects/altix2/sys/dev/fdt/fdt_x86.c
  projects/altix2/sys/dev/fdt/fdtbus.c
  projects/altix2/sys/dev/fdt/simplebus.c
  projects/altix2/sys/dev/ffec/if_ffec.c
  projects/altix2/sys/dev/firewire/if_fwe.c
  projects/altix2/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
  projects/altix2/sys/dev/ipw/if_ipw.c
  projects/altix2/sys/dev/iscsi/icl.c
  projects/altix2/sys/dev/iwi/if_iwi.c
  projects/altix2/sys/dev/iwn/if_iwn.c
  projects/altix2/sys/dev/iwn/if_iwn_devid.h
  projects/altix2/sys/dev/ixgbe/ixgbe.c
  projects/altix2/sys/dev/malo/if_malo.c
  projects/altix2/sys/dev/mfi/mfi_cam.c
  projects/altix2/sys/dev/mwl/if_mwl.c
  projects/altix2/sys/dev/nand/nand_id.c
  projects/altix2/sys/dev/nand/nandbus.c
  projects/altix2/sys/dev/nand/nfc_at91.c
  projects/altix2/sys/dev/netmap/if_em_netmap.h
  projects/altix2/sys/dev/netmap/if_igb_netmap.h
  projects/altix2/sys/dev/netmap/if_lem_netmap.h
  projects/altix2/sys/dev/netmap/if_re_netmap.h
  projects/altix2/sys/dev/netmap/ixgbe_netmap.h
  projects/altix2/sys/dev/netmap/netmap.c
  projects/altix2/sys/dev/netmap/netmap_freebsd.c
  projects/altix2/sys/dev/netmap/netmap_generic.c
  projects/altix2/sys/dev/netmap/netmap_kern.h
  projects/altix2/sys/dev/netmap/netmap_mbq.c
  projects/altix2/sys/dev/netmap/netmap_mbq.h
  projects/altix2/sys/dev/netmap/netmap_mem2.c
  projects/altix2/sys/dev/netmap/netmap_mem2.h
  projects/altix2/sys/dev/netmap/netmap_vale.c
  projects/altix2/sys/dev/nvme/nvme_ctrlr.c
  projects/altix2/sys/dev/qlxge/qls_os.c
  projects/altix2/sys/dev/ral/rt2560.c
  projects/altix2/sys/dev/ral/rt2661.c
  projects/altix2/sys/dev/ral/rt2860.c
  projects/altix2/sys/dev/uart/uart_bus_fdt.c
  projects/altix2/sys/dev/uart/uart_core.c
  projects/altix2/sys/dev/uart/uart_cpu.h
  projects/altix2/sys/dev/uart/uart_dev_imx.c
  projects/altix2/sys/dev/uart/uart_dev_lpc.c
  projects/altix2/sys/dev/uart/uart_dev_ns8250.c
  projects/altix2/sys/dev/uart/uart_dev_ns8250.h
  projects/altix2/sys/dev/uart/uart_dev_pl011.c
  projects/altix2/sys/dev/uart/uart_dev_quicc.c
  projects/altix2/sys/dev/uart/uart_dev_sab82532.c
  projects/altix2/sys/dev/uart/uart_dev_z8530.c
  projects/altix2/sys/dev/uart/uart_if.m
  projects/altix2/sys/dev/usb/controller/ehci.c
  projects/altix2/sys/dev/usb/controller/uhci.c
  projects/altix2/sys/dev/usb/controller/xhci.c
  projects/altix2/sys/dev/usb/input/ukbd.c
  projects/altix2/sys/dev/usb/net/uhso.c
  projects/altix2/sys/dev/usb/serial/u3g.c
  projects/altix2/sys/dev/usb/serial/umcs.c
  projects/altix2/sys/dev/usb/usb_dev.c
  projects/altix2/sys/dev/usb/usb_device.c
  projects/altix2/sys/dev/usb/usb_device.h
  projects/altix2/sys/dev/usb/usb_hub.c
  projects/altix2/sys/dev/usb/usb_hub.h
  projects/altix2/sys/dev/usb/usb_request.c
  projects/altix2/sys/dev/usb/usb_transfer.c
  projects/altix2/sys/dev/usb/usbdevs
  projects/altix2/sys/dev/usb/wlan/if_rsu.c
  projects/altix2/sys/dev/usb/wlan/if_rum.c
  projects/altix2/sys/dev/usb/wlan/if_run.c
  projects/altix2/sys/dev/usb/wlan/if_runreg.h
  projects/altix2/sys/dev/usb/wlan/if_runvar.h
  projects/altix2/sys/dev/usb/wlan/if_uath.c
  projects/altix2/sys/dev/usb/wlan/if_upgt.c
  projects/altix2/sys/dev/usb/wlan/if_ural.c
  projects/altix2/sys/dev/usb/wlan/if_urtw.c
  projects/altix2/sys/dev/usb/wlan/if_urtwn.c
  projects/altix2/sys/dev/usb/wlan/if_zyd.c
  projects/altix2/sys/dev/virtio/block/virtio_blk.c
  projects/altix2/sys/dev/virtio/scsi/virtio_scsi.c
  projects/altix2/sys/dev/vt/hw/vga/vga.c
  projects/altix2/sys/dev/vt/hw/xboxfb/xboxfb.c
  projects/altix2/sys/dev/wi/if_wi.c
  projects/altix2/sys/dev/wpi/if_wpi.c
  projects/altix2/sys/fs/ext2fs/ext2_inode_cnv.c
  projects/altix2/sys/fs/nfs/nfs_var.h
  projects/altix2/sys/fs/nfs/nfsrvcache.h
  projects/altix2/sys/fs/nfsserver/nfs_nfsdcache.c
  projects/altix2/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/altix2/sys/fs/nfsserver/nfs_nfsdport.c
  projects/altix2/sys/fs/nfsserver/nfs_nfsdsubs.c
  projects/altix2/sys/geom/multipath/g_multipath.c
  projects/altix2/sys/geom/uncompress/g_uncompress.c
  projects/altix2/sys/i386/conf/NOTES
  projects/altix2/sys/i386/i386/identcpu.c
  projects/altix2/sys/ia64/conf/GENERIC
  projects/altix2/sys/ia64/ia64/exception.S
  projects/altix2/sys/ia64/ia64/pmap.c
  projects/altix2/sys/kern/kern_descrip.c
  projects/altix2/sys/kern/kern_event.c
  projects/altix2/sys/kern/subr_sglist.c
  projects/altix2/sys/kern/subr_witness.c
  projects/altix2/sys/kern/uipc_mbuf.c
  projects/altix2/sys/kern/uipc_sockbuf.c
  projects/altix2/sys/kern/uipc_socket.c
  projects/altix2/sys/kern/uipc_syscalls.c
  projects/altix2/sys/mips/adm5120/uart_dev_adm5120.c
  projects/altix2/sys/mips/atheros/uart_dev_ar933x.c
  projects/altix2/sys/mips/cavium/ciu.c
  projects/altix2/sys/mips/cavium/uart_dev_oct16550.c
  projects/altix2/sys/mips/conf/TP-WN1043ND.hints
  projects/altix2/sys/mips/include/fdt.h
  projects/altix2/sys/mips/rt305x/uart_dev_rt305x.c
  projects/altix2/sys/modules/aic7xxx/Makefile
  projects/altix2/sys/modules/aic7xxx/ahc/Makefile
  projects/altix2/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile
  projects/altix2/sys/modules/aic7xxx/ahc/ahc_isa/Makefile
  projects/altix2/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
  projects/altix2/sys/modules/aic7xxx/ahd/Makefile
  projects/altix2/sys/modules/geom/Makefile
  projects/altix2/sys/modules/geom/geom_uncompress/Makefile
  projects/altix2/sys/modules/iwnfw/Makefile
  projects/altix2/sys/modules/sound/driver/ai2s/Makefile
  projects/altix2/sys/modules/virtio/Makefile
  projects/altix2/sys/net/ieee8023ad_lacp.c
  projects/altix2/sys/net/if.c
  projects/altix2/sys/net/if_arcsubr.c
  projects/altix2/sys/net/if_dl.h
  projects/altix2/sys/net/if_ethersubr.c
  projects/altix2/sys/net/if_fddisubr.c
  projects/altix2/sys/net/if_iso88025subr.c
  projects/altix2/sys/net/if_lagg.c
  projects/altix2/sys/net/if_tap.c
  projects/altix2/sys/net/if_tun.c
  projects/altix2/sys/net/netmap.h
  projects/altix2/sys/net/netmap_user.h
  projects/altix2/sys/net/radix.c
  projects/altix2/sys/net/radix.h
  projects/altix2/sys/net/radix_mpath.c
  projects/altix2/sys/net/route.c
  projects/altix2/sys/net/route.h
  projects/altix2/sys/net/rtsock.c
  projects/altix2/sys/net/sff8472.h
  projects/altix2/sys/net80211/ieee80211.h
  projects/altix2/sys/net80211/ieee80211_adhoc.c
  projects/altix2/sys/net80211/ieee80211_hostap.c
  projects/altix2/sys/net80211/ieee80211_mesh.c
  projects/altix2/sys/net80211/ieee80211_output.c
  projects/altix2/sys/net80211/ieee80211_proto.c
  projects/altix2/sys/net80211/ieee80211_sta.c
  projects/altix2/sys/net80211/ieee80211_wds.c
  projects/altix2/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  projects/altix2/sys/netgraph/netflow/netflow.c
  projects/altix2/sys/netgraph/ng_l2tp.c
  projects/altix2/sys/netinet/if_ether.c
  projects/altix2/sys/netinet/in.c
  projects/altix2/sys/netinet/in_mcast.c
  projects/altix2/sys/netinet/ip_carp.c
  projects/altix2/sys/netinet/ip_output.c
  projects/altix2/sys/netinet/tcp_syncache.c
  projects/altix2/sys/netinet6/in6.c
  projects/altix2/sys/netinet6/in6_ifattach.c
  projects/altix2/sys/netinet6/in6_mcast.c
  projects/altix2/sys/netinet6/in6_src.c
  projects/altix2/sys/netinet6/in6_var.h
  projects/altix2/sys/netinet6/ip6_mroute.c
  projects/altix2/sys/netinet6/ip6_mroute.h
  projects/altix2/sys/netinet6/mld6.c
  projects/altix2/sys/netinet6/nd6.c
  projects/altix2/sys/netinet6/nd6.h
  projects/altix2/sys/netinet6/nd6_nbr.c
  projects/altix2/sys/netinet6/nd6_rtr.c
  projects/altix2/sys/netpfil/ipfw/ip_fw_table.c
  projects/altix2/sys/netpfil/pf/pf_lb.c
  projects/altix2/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
  projects/altix2/sys/powerpc/include/atomic.h
  projects/altix2/sys/powerpc/powermac/macgpio.c
  projects/altix2/sys/powerpc/powermac/macgpiovar.h
  projects/altix2/sys/powerpc/powermac/pmu.c
  projects/altix2/sys/rpc/svc.c
  projects/altix2/sys/rpc/svc.h
  projects/altix2/sys/rpc/svc_dg.c
  projects/altix2/sys/rpc/svc_vc.c
  projects/altix2/sys/sys/event.h
  projects/altix2/sys/sys/mbuf.h
  projects/altix2/sys/sys/pmckern.h
  projects/altix2/sys/sys/random.h
  projects/altix2/sys/sys/sf_sync.h
  projects/altix2/sys/sys/sglist.h
  projects/altix2/sys/sys/socket.h
  projects/altix2/sys/sys/user.h
  projects/altix2/sys/vm/vm_pageout.c
  projects/altix2/sys/x86/include/fdt.h
  projects/altix2/sys/x86/include/ofw_machdep.h
  projects/altix2/sys/x86/x86/mca.c
  projects/altix2/sys/x86/x86/nexus.c
  projects/altix2/tools/build/mk/OptionalObsoleteFiles.inc
  projects/altix2/tools/regression/capsicum/libcapsicum/Makefile
  projects/altix2/tools/regression/capsicum/libcapsicum/dns.c
  projects/altix2/tools/regression/capsicum/libcapsicum/grp.c
  projects/altix2/tools/regression/capsicum/libcapsicum/pwd.c
  projects/altix2/tools/regression/capsicum/libcapsicum/sysctl.c
  projects/altix2/tools/tools/mcgrab/mcgrab.cc
  projects/altix2/tools/tools/net80211/stumbler/stumbler.c
  projects/altix2/tools/tools/net80211/w00t/ap/ap.c
  projects/altix2/tools/tools/net80211/w00t/assoc/assoc.c
  projects/altix2/tools/tools/net80211/w00t/expand/expand.c
  projects/altix2/tools/tools/net80211/w00t/prga/prga.c
  projects/altix2/tools/tools/net80211/w00t/redir/redir.c
  projects/altix2/tools/tools/net80211/wesside/wesside/wesside.c
  projects/altix2/tools/tools/net80211/wlaninject/wlaninject.c
  projects/altix2/tools/tools/netmap/Makefile
  projects/altix2/tools/tools/netmap/bridge.c
  projects/altix2/tools/tools/netmap/nm_util.c
  projects/altix2/tools/tools/netmap/nm_util.h
  projects/altix2/tools/tools/netmap/pcap.c
  projects/altix2/tools/tools/netmap/pkt-gen.c
  projects/altix2/tools/tools/netmap/vale-ctl.c
  projects/altix2/tools/tools/usbtest/usb_msc_test.c
  projects/altix2/tools/tools/usbtest/usb_msc_test.h
  projects/altix2/usr.bin/atf/atf-sh/Makefile
  projects/altix2/usr.bin/atf/atf-sh/tests/Makefile
  projects/altix2/usr.bin/elfdump/elfdump.c
  projects/altix2/usr.bin/find/find.1
  projects/altix2/usr.bin/find/function.c
  projects/altix2/usr.bin/iscsictl/iscsictl.8
  projects/altix2/usr.bin/killall/killall.c
  projects/altix2/usr.bin/ktrdump/ktrdump.c
  projects/altix2/usr.bin/netstat/main.c
  projects/altix2/usr.bin/netstat/netstat.1
  projects/altix2/usr.bin/script/script.c
  projects/altix2/usr.bin/whois/whois.c
  projects/altix2/usr.sbin/bhyve/Makefile
  projects/altix2/usr.sbin/bhyve/acpi.c
  projects/altix2/usr.sbin/bhyve/acpi.h
  projects/altix2/usr.sbin/bhyve/atpic.c
  projects/altix2/usr.sbin/bhyve/bhyve.8
  projects/altix2/usr.sbin/bhyve/elcr.c
  projects/altix2/usr.sbin/bhyve/pci_emul.c
  projects/altix2/usr.sbin/bhyve/pci_emul.h
  projects/altix2/usr.sbin/bhyve/pci_lpc.c
  projects/altix2/usr.sbin/bhyve/pci_lpc.h
  projects/altix2/usr.sbin/bhyve/pit_8254.c
  projects/altix2/usr.sbin/bhyve/pm.c
  projects/altix2/usr.sbin/bhyve/post.c
  projects/altix2/usr.sbin/bhyve/rtc.c
  projects/altix2/usr.sbin/bhyve/virtio.c
  projects/altix2/usr.sbin/bhyvectl/bhyvectl.c
  projects/altix2/usr.sbin/bsdconfig/share/strings.subr
  projects/altix2/usr.sbin/bsdinstall/scripts/services
  projects/altix2/usr.sbin/bsdinstall/scripts/wlanconfig
  projects/altix2/usr.sbin/mfiutil/Makefile
  projects/altix2/usr.sbin/pciconf/pciconf.8
  projects/altix2/usr.sbin/pciconf/pciconf.c
  projects/altix2/usr.sbin/rpc.lockd/kern.c
  projects/altix2/usr.sbin/rpc.lockd/lock_proc.c
  projects/altix2/usr.sbin/rpc.lockd/lockd.c
Directory Properties:
  projects/altix2/   (props changed)
  projects/altix2/cddl/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/altix2/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/altix2/contrib/atf/   (props changed)
  projects/altix2/contrib/byacc/   (props changed)
  projects/altix2/contrib/gcc/   (props changed)
  projects/altix2/contrib/libpcap/   (props changed)
  projects/altix2/contrib/ntp/   (props changed)
  projects/altix2/crypto/openssl/   (props changed)
  projects/altix2/etc/   (props changed)
  projects/altix2/gnu/lib/   (props changed)
  projects/altix2/gnu/usr.bin/gdb/   (props changed)
  projects/altix2/include/   (props changed)
  projects/altix2/lib/libc/   (props changed)
  projects/altix2/sbin/   (props changed)
  projects/altix2/share/man/man4/   (props changed)
  projects/altix2/sys/   (props changed)
  projects/altix2/sys/amd64/vmm/   (props changed)
  projects/altix2/sys/boot/   (props changed)
  projects/altix2/sys/cddl/contrib/opensolaris/   (props changed)
  projects/altix2/sys/conf/   (props changed)
  projects/altix2/sys/contrib/ipfilter/   (props changed)
  projects/altix2/sys/dev/hyperv/   (props changed)
  projects/altix2/usr.sbin/bhyve/   (props changed)
  projects/altix2/usr.sbin/bhyvectl/   (props changed)

Modified: projects/altix2/Makefile.inc1
==============================================================================
--- projects/altix2/Makefile.inc1	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/Makefile.inc1	Mon Jan 20 18:59:07 2014	(r260917)
@@ -1369,15 +1369,6 @@ kernel-tools: .MAKE
 	mkdir -p ${MAKEOBJDIRPREFIX}/usr
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
 	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
-.for _tool in \
-    sys/dev/aic7xxx/aicasm
-	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
-		cd ${.CURDIR}/${_tool} && \
-		${MAKE} DIRPRFX=${_tool}/ obj && \
-		${MAKE} DIRPRFX=${_tool}/ depend && \
-		${MAKE} DIRPRFX=${_tool}/ all && \
-		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
-.endfor
 
 #
 # cross-tools: Build cross-building tools

Modified: projects/altix2/UPDATING
==============================================================================
--- projects/altix2/UPDATING	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/UPDATING	Mon Jan 20 18:59:07 2014	(r260917)
@@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140110:
+	If a Makefile in a tests/ directory was auto-generating a Kyuafile
+	instead of providing an explicit one, this would prevent such
+	Makefile from providing its own Kyuafile in the future during
+	NO_CLEAN builds.  This has been fixed in the Makefiles but manual
+	intervention is needed to clean an objdir if you use NO_CLEAN:
+	  # find /usr/obj -name Kyuafile | xargs rm -f
+
 20131213:
 	The behavior of gss_pseudo_random() for the krb5 mechanism
 	has changed, for applications requesting a longer random string

Modified: projects/altix2/bin/cat/cat.c
==============================================================================
--- projects/altix2/bin/cat/cat.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/cat/cat.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -316,6 +316,7 @@ udom_open(const char *path, int flags)
 		sou.sun_family = AF_UNIX;
 		if ((len = strlcpy(sou.sun_path, path,
 		    sizeof(sou.sun_path))) >= sizeof(sou.sun_path)) {
+			close(fd);
 			errno = ENAMETOOLONG;
 			return (-1);
 		}

Modified: projects/altix2/bin/df/df.1
==============================================================================
--- projects/altix2/bin/df/df.1	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/df/df.1	Mon Jan 20 18:59:07 2014	(r260917)
@@ -29,7 +29,7 @@
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
 .\" $FreeBSD$
 .\"
-.Dd January 24, 2013
+.Dd January 16, 2014
 .Dt DF 1
 .Os
 .Sh NAME
@@ -83,13 +83,13 @@ Use 1073741824 byte (1 Gibibyte) blocks 
 This overrides any
 .Ev BLOCKSIZE
 specification from the environment.
-.It Fl H
+.It Fl h
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kibibyte, Mebibyte, Gibibyte, Tebibyte and
 Pebibyte (based on powers of 1024) in order to reduce the number of
 digits to four or fewer.
-.It Fl h
+.It Fl H
 .Dq Human-readable
 output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,

Modified: projects/altix2/bin/pax/tests/Makefile
==============================================================================
--- projects/altix2/bin/pax/tests/Makefile	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/pax/tests/Makefile	Mon Jan 20 18:59:07 2014	(r260917)
@@ -4,6 +4,6 @@
 
 TESTSDIR=	${TESTSBASE}/bin/pax
 
-TAP_TESTS_SH=	legacy_test
+TAP_TESTS_PERL=	legacy_test
 
 .include <tap.test.mk>

Copied: projects/altix2/bin/pax/tests/legacy_test.pl (from r260914, head/bin/pax/tests/legacy_test.pl)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/altix2/bin/pax/tests/legacy_test.pl	Mon Jan 20 18:59:07 2014	(r260917, copy of r260914, head/bin/pax/tests/legacy_test.pl)
@@ -0,0 +1,89 @@
+# $FreeBSD$
+
+use strict;
+use warnings;
+
+use Test::More tests => 6;
+use File::Path qw(rmtree mkpath);
+use Cwd;
+
+my $n = 0;
+sub create_file {
+    my $fn = shift;
+
+    $n++;
+    (my $dir = $fn) =~ s,/[^/]+$,,;
+    mkpath $dir;
+    open my $fd, ">", $fn or die "$fn: $!";
+    print $fd "file $n\n";
+}
+
+
+ustar_pathnames: { SKIP: {
+    # Prove that pax breaks up ustar pathnames properly
+
+    my $top = getcwd . "/ustar-pathnames-1";
+    skip "Current path is too long", 6 if length $top > 92;
+    rmtree $top;
+    my $subdir = "x" . "x" x (92 - length $top);
+    my $work94 = "$top/$subdir";
+    mkpath $work94;		# $work is 94 characters long
+
+    my $x49 = "x" x 49;
+    my $x50 = "x" x 50;
+    my $x60 = "x" x 60;
+    my $x95 = "x" x 95;
+
+    my @paths = (
+	"$work94/x099",		# 99 chars
+	"$work94/xx100",		# 100 chars
+	"$work94/xxx101",		# 101 chars
+	"$work94/$x49/${x50}x199",	# 199 chars
+	"$work94/$x49/${x50}xx200",	# 200 chars
+	"$work94/$x49/${x50}xxx201",	# 201 chars
+	"$work94/$x60/${x95}254",	# 254 chars
+	"$work94/$x60/${x95}x255",	# 255 chars
+    );
+
+    my @l = map { length } @paths;
+
+    my $n = 0;
+    create_file $_ for @paths;
+    system "pax -wf ustar.ok $work94";
+    ok($? == 0, "Wrote 'ustar.ok' containing files with lengths @l");
+
+    (my $orig = $top) =~ s,1$,2,;
+    rmtree $orig;
+    rename $top, $orig;
+
+    system "pax -rf ustar.ok";
+    ok($? == 0, "Restored 'ustar.ok' containing files with lengths @l");
+
+    system "diff -ru $orig $top";
+    ok($? == 0, "Restored files are identical");
+
+    rmtree $top;
+    rename $orig, $top;
+
+    # 256 chars (with components < 100 chars) should not work
+    push @paths, "$work94/x$x60/${x95}x256";	# 256 chars
+    push @l, length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail1 $work94";
+    ok($?, "Failed to write 'ustar.fail1' containing files with lengths @l");
+
+    # Components with 100 chars shouldn't work
+    unlink $paths[-1];
+    $paths[-1] = "$work94/${x95}xc100";		# 100 char filename
+    $l[-1] = length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail2 $work94";
+    ok($?, "Failed to write 'ustar.fail2' with a 100 char filename");
+
+    unlink $paths[-1];
+    $paths[-1] = "$work94/${x95}xc100/x";	# 100 char component
+    $l[-1] = length $paths[-1];
+    create_file $paths[-1];
+    system "pax -wf ustar.fail3 $work94";
+    ok($?, "Failed to write 'ustar.fail3' with a 100 char component");
+}}

Modified: projects/altix2/bin/sh/input.c
==============================================================================
--- projects/altix2/bin/sh/input.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/sh/input.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -162,20 +162,16 @@ preadfd(void)
 	int nr;
 	parsenextc = parsefile->buf;
 
-#ifndef NO_HISTORY
-	if (el != NULL && gotwinch) {
-		gotwinch = 0;
-		el_resize(el);
-	}
-#endif
 retry:
 #ifndef NO_HISTORY
 	if (parsefile->fd == 0 && el) {
 		static const char *rl_cp;
 		static int el_len;
 
-		if (rl_cp == NULL)
+		if (rl_cp == NULL) {
+			el_resize(el);
 			rl_cp = el_gets(el, &el_len);
+		}
 		if (rl_cp == NULL)
 			nr = el_len == 0 ? 0 : -1;
 		else {

Modified: projects/altix2/bin/sh/sh.1
==============================================================================
--- projects/altix2/bin/sh/sh.1	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/sh/sh.1	Mon Jan 20 18:59:07 2014	(r260917)
@@ -32,7 +32,7 @@
 .\"	from: @(#)sh.1	8.6 (Berkeley) 5/4/95
 .\" $FreeBSD$
 .\"
-.Dd November 1, 2013
+.Dd January 3, 2014
 .Dt SH 1
 .Os
 .Sh NAME
@@ -235,10 +235,16 @@ or
 .Dq Li ||
 operator; or if the command is a pipeline preceded by the
 .Ic !\&
-operator.
+keyword.
 If a shell function is executed and its exit status is explicitly
 tested, all commands of the function are considered to be tested as
 well.
+.Pp
+It is recommended to check for failures explicitly
+instead of relying on
+.Fl e
+because it tends to behave in unexpected ways,
+particularly in larger scripts.
 .It Fl f Li noglob
 Disable pathname expansion.
 .It Fl h Li trackall

Modified: projects/altix2/bin/sh/tests/Makefile
==============================================================================
--- projects/altix2/bin/sh/tests/Makefile	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/sh/tests/Makefile	Mon Jan 20 18:59:07 2014	(r260917)
@@ -6,6 +6,12 @@ TESTSDIR=	${TESTSBASE}/bin/sh
 
 TAP_TESTS_SH=	legacy_test
 TAP_TESTS_SH_SED_legacy_test=	-e 's,__SH__,/bin/sh,g'
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 SUBDIR+=	builtins errors execution expansion parameters parser set-e
 

Modified: projects/altix2/bin/sh/trap.c
==============================================================================
--- projects/altix2/bin/sh/trap.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/sh/trap.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -80,7 +80,6 @@ static char *volatile trap[NSIG];	/* tra
 static volatile sig_atomic_t gotsig[NSIG];
 				/* indicates specified signal received */
 static int ignore_sigchld;	/* Used while handling SIGCHLD traps. */
-volatile sig_atomic_t gotwinch;
 static int last_trapsig;
 
 static int exiting;		/* exitshell() has been called */
@@ -293,12 +292,6 @@ setsignal(int signo)
 				action = S_IGN;
 			break;
 #endif
-#ifndef NO_HISTORY
-		case SIGWINCH:
-			if (rootshell && iflag)
-				action = S_CATCH;
-			break;
-#endif
 		}
 	}
 
@@ -400,11 +393,6 @@ onsig(int signo)
 		gotsig[signo] = 1;
 		pendingsig = signo;
 	}
-
-#ifndef NO_HISTORY
-	if (signo == SIGWINCH)
-		gotwinch = 1;
-#endif
 }
 
 
@@ -490,9 +478,6 @@ setinteractive(int on)
 	setsignal(SIGINT);
 	setsignal(SIGQUIT);
 	setsignal(SIGTERM);
-#ifndef NO_HISTORY
-	setsignal(SIGWINCH);
-#endif
 	is_interactive = on;
 }
 

Modified: projects/altix2/bin/sh/trap.h
==============================================================================
--- projects/altix2/bin/sh/trap.h	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/sh/trap.h	Mon Jan 20 18:59:07 2014	(r260917)
@@ -36,7 +36,6 @@
 extern volatile sig_atomic_t pendingsig;
 extern volatile sig_atomic_t pendingsig_waitcmd;
 extern int in_dotrap;
-extern volatile sig_atomic_t gotwinch;
 
 void clear_traps(void);
 int have_traps(void);

Modified: projects/altix2/bin/test/tests/Makefile
==============================================================================
--- projects/altix2/bin/test/tests/Makefile	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/bin/test/tests/Makefile	Mon Jan 20 18:59:07 2014	(r260917)
@@ -5,5 +5,11 @@
 TESTSDIR=	${TESTSBASE}/bin/test
 
 TAP_TESTS_SH=	legacy_test
+# Some tests in here are silently not run when the tests are executed as
+# root.  Explicitly tell Kyua to drop privileges.
+#
+# TODO(jmmv): Kyua needs to do this by default, not only when explicitly
+# requested.  See https://code.google.com/p/kyua/issues/detail?id=6
+TEST_METADATA.legacy_test+= required_user="unprivileged"
 
 .include <tap.test.mk>

Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -3012,6 +3012,7 @@ zdb_read_block(char *thing, spa_t *spa)
 				free(dup);
 				return;
 			}
+			i += p - &flagstr[i + 1]; /* skip over the number */
 		}
 	}
 

Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Jan 20 18:59:07 2014	(r260917)
@@ -18,7 +18,7 @@
 .\" information: Portions Copyright [yyyy] [name of copyright owner]
 .\"
 .\" Copyright (c) 2010, Sun Microsystems, Inc. All Rights Reserved.
-.\" Copyright (c) 2012 by Delphix. All rights reserved.
+.\" Copyright (c) 2013 by Delphix. All rights reserved.
 .\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
 .\" Copyright (c) 2012, Glen Barber <gjb at FreeBSD.org>
 .\" Copyright (c) 2012, Bryan Drewery <bdrewery at FreeBSD.org>
@@ -26,10 +26,11 @@
 .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
 .\" Copyright (c) 2013, Steven Hartland <smh at FreeBSD.org>
+.\" Copyright (c) 2014, Xin LI <delphij at FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 24, 2013
+.Dd January 2, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -57,11 +58,16 @@
 .Cm destroy
 .Op Fl dnpRrv
 .Sm off
-.Ar snapshot
-.Op % Ns Ar snapname
+.Ar filesystem Ns | Ns volume
+.Ns @snap
+.Op % Ns Ar snap
+.Op , Ns Ar snap Op % Ns Ar snap
 .Op , Ns ...
 .Sm on
 .Nm
+.Cm destroy
+.Ar filesystem Ns | Ns Ar volume Ns # Ns Ar bookmark
+.Nm
 .Cm snapshot Ns | Ns Cm snap
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -168,11 +174,19 @@
 .Cm unshare
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Nm
+.Cm bookmark
+.Ar snapshot
+.Ar bookmark
+.Nm
 .Cm send
 .Op Fl DnPpRv
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
+.Cm send
+.Op Fl i Ar snapshot Ns | Ns bookmark
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Nm
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
@@ -1654,6 +1668,13 @@ options, as they can destroy large porti
 behavior for mounted file systems in use.
 .It Xo
 .Nm
+.Cm destroy
+.Ar filesystem Ns | Ns Ar volume Ns # Ns Ar bookmark
+.Xc
+.Pp
+The given bookmark is destroyed.
+.It Xo
+.Nm
 .Cm snapshot Ns | Ns Cm snap
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
@@ -1686,14 +1707,24 @@ Roll back the given dataset to a previou
 back, all data that has changed since the snapshot is discarded, and the
 dataset reverts to the state at the time of the snapshot. By default, the
 command refuses to roll back to a snapshot other than the most recent one. In
-order to do so, all intermediate snapshots must be destroyed by specifying the
+order to do so, all intermediate snapshots and bookmarks must be destroyed
+by specifying the
 .Fl r
 option.
+.Pp
+The
+.Fl rR
+options do not recursively destroy the child snapshots of a
+recursive snapshot.
+Only direct snapshots of the specified filesystem
+are destroyed by either of these options.
+To completely roll back a
+recursive snapshot, you must rollback the individual child snapshots.
 .Bl -tag -width indent
 .It Fl r
-Recursively destroy any snapshots more recent than the one specified.
+Destroy any snapshots and bookmarks more recent than the one specified.
 .It Fl R
-Recursively destroy any more recent snapshots, as well as any clones of those
+Destroy any more recent snapshots and bookmarks, as well as any clones of those
 snapshots.
 .It Fl f
 Used with the
@@ -1868,7 +1899,7 @@ syntax.
 A comma-separated list of types to display, where
 .Ar type
 is one of
-.Sy filesystem , snapshot , snap,  volume , No or Sy all .
+.Sy filesystem , snapshot , snap , volume , bookmark , No or Sy all .
 For example, specifying
 .Fl t Cm snapshot
 displays only snapshots.
@@ -1965,7 +1996,7 @@ sections.
 The special value
 .Cm all
 can be used to display all properties that apply to the given dataset's type
-(filesystem, volume, or snapshot).
+(filesystem, volume, snapshot, or bookmark).
 .Bl -tag -width indent
 .It Fl r
 Recursively display properties for any children.
@@ -2283,6 +2314,26 @@ file system shared on the system.
 .El
 .It Xo
 .Nm
+.Cm bookmark
+.Ar snapshot
+.Ar bookmark
+.Xc
+.Pp
+Creates a bookmark of the given snapshot.
+Bookmarks mark the point in time
+when the snapshot was created, and can be used as the incremental source for
+a
+.Qq Nm Cm send
+command.
+.Pp
+This feature must be enabled to be used.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy bookmark
+feature.
+.It Xo
+.Nm
 .Cm send
 .Op Fl DnPpRv
 .Op Fl i Ar snapshot | Fl I Ar snapshot
@@ -2301,17 +2352,15 @@ a file or to a different system (for exa
 By default, a full stream is generated.
 .Bl -tag -width indent
 .It Fl i Ar snapshot
-Generate an incremental stream from the
-.Fl i Ar snapshot
-to the last
-.Ar snapshot .
-The incremental source (the
-.Fl i Ar snapshot )
-can be specified as the last component of the snapshot name (for example, the
-part after the
-.Sy @ ) ,
-and it is assumed to be from the same file system as the last
-.Ar snapshot .
+Generate an incremental stream from the first
+.Ar snapshot Pq the incremental source
+to the second
+.Ar snapshot Pq the incremental target .
+The incremental source can be specified as the last component of the
+snapshot name
+.Pq the Em @ No character and following
+and
+it is assumed to be from the same file system as the incremental target.
 .Pp
 If the destination is a clone, the source may be the origin snapshot, which
 must be fully specified (for example,
@@ -2319,15 +2368,16 @@ must be fully specified (for example,
 not just
 .Cm @origin ) .
 .It Fl I Ar snapshot
-Generate a stream package that sends all intermediary snapshots from the
-.Fl I Ar snapshot
-to the last
+Generate a stream package that sends all intermediary snapshots from the first
+.Ar snapshot
+to the second
 .Ar snapshot .
 For example,
 .Ic -I @a fs at d
 is similar to
 .Ic -i @a fs at b; -i @b fs at c; -i @c fs at d .
-The incremental source snapshot may be specified as with the
+The incremental
+source may be specified as with the
 .Fl i
 option.
 .It Fl R
@@ -2380,6 +2430,35 @@ on future versions of
 .Tn ZFS .
 .It Xo
 .Nm
+.Cm send
+.Op Fl i Ar snapshot Ns | Ns Ar bookmark
+.Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
+.Xc
+.Pp
+Generate a send stream, which may be of a filesystem, and may be
+incremental from a bookmark.
+If the destination is a filesystem or volume,
+the pool must be read-only, or the filesystem must not be mounted.
+When the
+stream generated from a filesystem or volume is received, the default snapshot
+name will be
+.Pq --head-- .
+.Bl -tag -width indent
+.It Fl i Ar snapshot Ns | Ns bookmark
+Generate an incremental send stream.
+The incremental source must be an earlier
+snapshot in the destination's history.
+It will commonly be an earlier
+snapshot in the destination's filesystem, in which case it can be
+specified as the last component of the name
+.Pq the Em # No or Em @ No character and following .
+.Pp
+If the incremental target is a clone, the incremental source can
+be the origin snapshot, or an earlier snapshot in the origin's filesystem,
+or the origin's origin, etc.
+.El
+.It Xo
+.Nm
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot

Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -24,6 +24,7 @@
  * Copyright (c) 2012 Pawel Jakub Dawidek <pawel at dawidek.net>.
  * All rights reserved.
  * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include <libintl.h>
@@ -72,7 +73,7 @@ uu_avl_pool_t *avl_pool;
  * Include snaps if they were requested or if this a zfs list where types
  * were not specified and the "listsnapshots" property is set on this pool.
  */
-static int
+static boolean_t
 zfs_include_snapshots(zfs_handle_t *zhp, callback_data_t *cb)
 {
 	zpool_handle_t *zph;
@@ -92,8 +93,9 @@ static int
 zfs_callback(zfs_handle_t *zhp, void *data)
 {
 	callback_data_t *cb = data;
-	int dontclose = 0;
-	int include_snaps = zfs_include_snapshots(zhp, cb);
+	boolean_t dontclose = B_FALSE;
+	boolean_t include_snaps = zfs_include_snapshots(zhp, cb);
+	boolean_t include_bmarks = (cb->cb_types & ZFS_TYPE_BOOKMARK);
 
 	if ((zfs_get_type(zhp) & cb->cb_types) ||
 	    ((zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT) && include_snaps)) {
@@ -119,7 +121,7 @@ zfs_callback(zfs_handle_t *zhp, void *da
 				}
 			}
 			uu_avl_insert(cb->cb_avl, node, idx);
-			dontclose = 1;
+			dontclose = B_TRUE;
 		} else {
 			free(node);
 		}
@@ -134,11 +136,14 @@ zfs_callback(zfs_handle_t *zhp, void *da
 		cb->cb_depth++;
 		if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM)
 			(void) zfs_iter_filesystems(zhp, zfs_callback, data);
-		if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps) {
+		if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
+		    ZFS_TYPE_BOOKMARK)) == 0) && include_snaps)
 			(void) zfs_iter_snapshots(zhp,
 			    (cb->cb_flags & ZFS_ITER_SIMPLE) != 0, zfs_callback,
 			    data);
-		}
+		if (((zfs_get_type(zhp) & (ZFS_TYPE_SNAPSHOT |
+		    ZFS_TYPE_BOOKMARK)) == 0) && include_bmarks)
+			(void) zfs_iter_bookmarks(zhp, zfs_callback, data);
 		cb->cb_depth--;
 	}
 

Modified: projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Jan 20 18:51:16 2014	(r260916)
+++ projects/altix2/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Jan 20 18:59:07 2014	(r260917)
@@ -107,6 +107,7 @@ static int zfs_do_release(int argc, char
 static int zfs_do_diff(int argc, char **argv);
 static int zfs_do_jail(int argc, char **argv);
 static int zfs_do_unjail(int argc, char **argv);
+static int zfs_do_bookmark(int argc, char **argv);
 
 /*
  * Enable a reasonable set of defaults for libumem debugging on DEBUG builds.
@@ -155,6 +156,7 @@ typedef enum {
 	HELP_HOLDS,
 	HELP_RELEASE,
 	HELP_DIFF,
+	HELP_BOOKMARK,
 } zfs_help_t;
 
 typedef struct zfs_command {
@@ -181,6 +183,7 @@ static zfs_command_t command_table[] = {
 	{ "clone",	zfs_do_clone,		HELP_CLONE		},
 	{ "promote",	zfs_do_promote,		HELP_PROMOTE		},
 	{ "rename",	zfs_do_rename,		HELP_RENAME		},
+	{ "bookmark",	zfs_do_bookmark,	HELP_BOOKMARK		},
 	{ NULL },
 	{ "list",	zfs_do_list,		HELP_LIST		},
 	{ NULL },
@@ -231,11 +234,12 @@ get_usage(zfs_help_t idx)
 	case HELP_DESTROY:
 		return (gettext("\tdestroy [-fnpRrv] <filesystem|volume>\n"
 		    "\tdestroy [-dnpRrv] "
-		    "<snapshot>[%<snapname>][,...]\n"));
+		    "<filesystem|volume>@<snap>[%<snap>][,...]\n"
+		    "\tdestroy <filesystem|volume>#<bookmark>\n"));
 	case HELP_GET:
 		return (gettext("\tget [-rHp] [-d max] "
-		    "[-o \"all\" | field[,...]] [-t type[,...]] "
-		    "[-s source[,...]]\n"
+		    "[-o \"all\" | field[,...]]\n"
+		    "\t    [-t type[,...]] [-s source[,...]]\n"
 		    "\t    <\"all\" | property[,...]> "
 		    "[filesystem|volume|snapshot] ...\n"));
 	case HELP_INHERIT:
@@ -264,15 +268,16 @@ get_usage(zfs_help_t idx)
 	case HELP_RENAME:
 		return (gettext("\trename [-f] <filesystem|volume|snapshot> "
 		    "<filesystem|volume|snapshot>\n"
-		    "\trename [-f] -p <filesystem|volume> "
-		    "<filesystem|volume>\n"
+		    "\trename [-f] -p <filesystem|volume> <filesystem|volume>\n"
 		    "\trename -r <snapshot> <snapshot>\n"
 		    "\trename -u [-p] <filesystem> <filesystem>"));
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRv] "
-		    "[-i snapshot | -I snapshot] <snapshot>\n"));
+		return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] "
+		    "<snapshot>\n"
+		    "\tsend [-i snapshot|bookmark] "
+		    "<filesystem|volume|snapshot>\n"));
 	case HELP_SET:
 		return (gettext("\tset <property=value> "
 		    "<filesystem|volume|snapshot> ...\n"));
@@ -280,7 +285,7 @@ get_usage(zfs_help_t idx)
 		return (gettext("\tshare <-a | filesystem>\n"));
 	case HELP_SNAPSHOT:
 		return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
-		    "<filesystem at snapname|volume at snapname> ...\n"));
+		    "<filesystem|volume>@<snap> ...\n"));
 	case HELP_UNMOUNT:
 		return (gettext("\tunmount|umount [-f] "
 		    "<-a | filesystem|mountpoint>\n"));
@@ -309,11 +314,13 @@ get_usage(zfs_help_t idx)
 		    "<filesystem|volume>\n"));
 	case HELP_USERSPACE:
 		return (gettext("\tuserspace [-Hinp] [-o field[,...]] "
-		    "[-s field]...\n\t    [-S field]... [-t type[,...]] "
+		    "[-s field] ...\n"
+		    "\t    [-S field] ... [-t type[,...]] "
 		    "<filesystem|snapshot>\n"));
 	case HELP_GROUPSPACE:
 		return (gettext("\tgroupspace [-Hinp] [-o field[,...]] "
-		    "[-s field]...\n\t    [-S field]... [-t type[,...]] "
+		    "[-s field] ...\n"
+		    "\t    [-S field] ... [-t type[,...]] "
 		    "<filesystem|snapshot>\n"));
 	case HELP_HOLD:
 		return (gettext("\thold [-r] <tag> <snapshot> ...\n"));
@@ -324,6 +331,8 @@ get_usage(zfs_help_t idx)
 	case HELP_DIFF:
 		return (gettext("\tdiff [-FHt] <snapshot> "
 		    "[snapshot|filesystem]\n"));
+	case HELP_BOOKMARK:
+		return (gettext("\tbookmark <snapshot> <bookmark>\n"));
 	}
 
 	abort();
@@ -926,6 +935,7 @@ typedef struct destroy_cbdata {
 	char		*cb_prevsnap;
 	int64_t		cb_snapused;
 	char		*cb_snapspec;
+	char		*cb_bookmark;
 } destroy_cbdata_t;
 
 /*
@@ -1195,7 +1205,7 @@ zfs_do_destroy(int argc, char **argv)
 	int err = 0;
 	int c;
 	zfs_handle_t *zhp = NULL;
-	char *at;
+	char *at, *pound;
 	zfs_type_t type = ZFS_TYPE_DATASET;
 
 	/* check options */
@@ -1247,6 +1257,7 @@ zfs_do_destroy(int argc, char **argv)
 	}
 
 	at = strchr(argv[0], '@');
+	pound = strchr(argv[0], '#');
 	if (at != NULL) {
 
 		/* Build the list of snaps to destroy in cb_nvl. */
@@ -1308,6 +1319,46 @@ zfs_do_destroy(int argc, char **argv)
 
 		if (err != 0)
 			rv = 1;
+	} else if (pound != NULL) {
+		int err;
+		nvlist_t *nvl;
+
+		if (cb.cb_dryrun) {
+			(void) fprintf(stderr,
+			    "dryrun is not supported with bookmark\n");
+			return (-1);
+		}
+
+		if (cb.cb_defer_destroy) {
+			(void) fprintf(stderr,
+			    "defer destroy is not supported with bookmark\n");
+			return (-1);
+		}
+
+		if (cb.cb_recurse) {
+			(void) fprintf(stderr,
+			    "recursive is not supported with bookmark\n");
+			return (-1);
+		}
+
+		if (!zfs_bookmark_exists(argv[0])) {
+			(void) fprintf(stderr, gettext("bookmark '%s' "
+			    "does not exist.\n"), argv[0]);
+			return (1);
+		}
+
+		nvl = fnvlist_alloc();
+		fnvlist_add_boolean(nvl, argv[0]);
+
+		err = lzc_destroy_bookmarks(nvl, NULL);
+		if (err != 0) {
+			(void) zfs_standard_error(g_zfs, err,
+			    "cannot destroy bookmark");
+		}
+
+		nvlist_free(cb.cb_nvl);
+
+		return (err);
 	} else {
 		/* Open the given dataset */
 		if ((zhp = zfs_open(g_zfs, argv[0], type)) == NULL)
@@ -1670,7 +1721,8 @@ zfs_do_get(int argc, char **argv)
 			flags &= ~ZFS_ITER_PROP_LISTSNAPS;
 			while (*optarg != '\0') {
 				static char *type_subopts[] = { "filesystem",
-				    "volume", "snapshot", "all", NULL };
+				    "volume", "snapshot", "bookmark",
+				    "all", NULL };
 
 				switch (getsubopt(&optarg, type_subopts,
 				    &value)) {
@@ -1684,7 +1736,11 @@ zfs_do_get(int argc, char **argv)
 					types |= ZFS_TYPE_SNAPSHOT;
 					break;
 				case 3:
-					types = ZFS_TYPE_DATASET;
+					types |= ZFS_TYPE_BOOKMARK;
+					break;
+				case 4:
+					types = ZFS_TYPE_DATASET |
+					    ZFS_TYPE_BOOKMARK;
 					break;
 
 				default:
@@ -3029,7 +3085,8 @@ zfs_do_list(int argc, char **argv)
 			flags &= ~ZFS_ITER_PROP_LISTSNAPS;
 			while (*optarg != '\0') {
 				static char *type_subopts[] = { "filesystem",
-				    "volume", "snapshot", "snap", "all", NULL };
+				    "volume", "snapshot", "snap", "bookmark",
+				    "all", NULL };
 
 				switch (getsubopt(&optarg, type_subopts,
 				    &value)) {
@@ -3044,9 +3101,12 @@ zfs_do_list(int argc, char **argv)
 					types |= ZFS_TYPE_SNAPSHOT;
 					break;
 				case 4:
-					types = ZFS_TYPE_DATASET;
+					types |= ZFS_TYPE_BOOKMARK;
+					break;
+				case 5:
+					types = ZFS_TYPE_DATASET |
+					    ZFS_TYPE_BOOKMARK;
 					break;
-
 				default:
 					(void) fprintf(stderr,
 					    gettext("invalid type '%s'\n"),
@@ -3286,9 +3346,29 @@ typedef struct rollback_cbdata {
 	char		*cb_target;
 	int		cb_error;
 	boolean_t	cb_recurse;
-	boolean_t	cb_dependent;
 } rollback_cbdata_t;
 
+static int
+rollback_check_dependent(zfs_handle_t *zhp, void *data)
+{
+	rollback_cbdata_t *cbp = data;
+
+	if (cbp->cb_first && cbp->cb_recurse) {
+		(void) fprintf(stderr, gettext("cannot rollback to "
+		    "'%s': clones of previous snapshots exist\n"),
+		    cbp->cb_target);
+		(void) fprintf(stderr, gettext("use '-R' to "
+		    "force deletion of the following clones and "
+		    "dependents:\n"));
+		cbp->cb_first = 0;
+		cbp->cb_error = 1;
+	}
+
+	(void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
+
+	zfs_close(zhp);
+	return (0);
+}
 /*
  * Report any snapshots more recent than the one specified.  Used when '-r' is
  * not specified.  We reuse this same callback for the snapshot dependents - if
@@ -3305,52 +3385,30 @@ rollback_check(zfs_handle_t *zhp, void *
 		return (0);
 	}
 
-	if (!cbp->cb_dependent) {
-		if (strcmp(zfs_get_name(zhp), cbp->cb_target) != 0 &&
-		    zfs_get_type(zhp) == ZFS_TYPE_SNAPSHOT &&
-		    zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG) >
-		    cbp->cb_create) {
-
-			if (cbp->cb_first && !cbp->cb_recurse) {
-				(void) fprintf(stderr, gettext("cannot "
-				    "rollback to '%s': more recent snapshots "
-				    "exist\n"),
-				    cbp->cb_target);
-				(void) fprintf(stderr, gettext("use '-r' to "
-				    "force deletion of the following "
-				    "snapshots:\n"));
-				cbp->cb_first = 0;
-				cbp->cb_error = 1;
-			}
-
-			if (cbp->cb_recurse) {
-				cbp->cb_dependent = B_TRUE;
-				if (zfs_iter_dependents(zhp, B_TRUE,
-				    rollback_check, cbp) != 0) {
-					zfs_close(zhp);
-					return (-1);
-				}
-				cbp->cb_dependent = B_FALSE;
-			} else {
-				(void) fprintf(stderr, "%s\n",
-				    zfs_get_name(zhp));
-			}
-		}
-	} else {
-		if (cbp->cb_first && cbp->cb_recurse) {
-			(void) fprintf(stderr, gettext("cannot rollback to "
-			    "'%s': clones of previous snapshots exist\n"),
+	if (zfs_prop_get_int(zhp, ZFS_PROP_CREATETXG) > cbp->cb_create) {
+		if (cbp->cb_first && !cbp->cb_recurse) {
+			(void) fprintf(stderr, gettext("cannot "
+			    "rollback to '%s': more recent snapshots "
+			    "or bookmarks exist\n"),
 			    cbp->cb_target);
-			(void) fprintf(stderr, gettext("use '-R' to "
-			    "force deletion of the following clones and "
-			    "dependents:\n"));
+			(void) fprintf(stderr, gettext("use '-r' to "
+			    "force deletion of the following "
+			    "snapshots and bookmarks:\n"));
 			cbp->cb_first = 0;
 			cbp->cb_error = 1;
 		}
 
-		(void) fprintf(stderr, "%s\n", zfs_get_name(zhp));
+		if (cbp->cb_recurse) {
+			if (zfs_iter_dependents(zhp, B_TRUE,
+			    rollback_check_dependent, cbp) != 0) {
+				zfs_close(zhp);
+				return (-1);
+			}
+		} else {
+			(void) fprintf(stderr, "%s\n",
+			    zfs_get_name(zhp));
+		}
 	}
-
 	zfs_close(zhp);
 	return (0);
 }
@@ -3420,7 +3478,9 @@ zfs_do_rollback(int argc, char **argv)
 	cb.cb_create = zfs_prop_get_int(snap, ZFS_PROP_CREATETXG);
 	cb.cb_first = B_TRUE;
 	cb.cb_error = 0;
-	if ((ret = zfs_iter_children(zhp, rollback_check, &cb)) != 0)
+	if ((ret = zfs_iter_snapshots(zhp, B_FALSE, rollback_check, &cb)) != 0)
+		goto out;
+	if ((ret = zfs_iter_bookmarks(zhp, rollback_check, &cb)) != 0)
 		goto out;
 
 	if ((ret = cb.cb_error) != 0)
@@ -3715,12 +3775,45 @@ zfs_do_send(int argc, char **argv)
 		return (1);
 	}
 
-	cp = strchr(argv[0], '@');
-	if (cp == NULL) {
-		(void) fprintf(stderr,
-		    gettext("argument must be a snapshot\n"));
-		usage(B_FALSE);
+	/*
+	 * Special case sending a filesystem, or from a bookmark.
+	 */
+	if (strchr(argv[0], '@') == NULL ||
+	    (fromname && strchr(fromname, '#') != NULL)) {
+		char frombuf[ZFS_MAXNAMELEN];
+
+		if (flags.replicate || flags.doall || flags.props ||
+		    flags.dedup || flags.dryrun || flags.verbose ||
+		    flags.progress) {
+			(void) fprintf(stderr,
+			    gettext("Error: "
+			    "Unsupported flag with filesystem or bookmark.\n"));
+			return (1);
+		}
+
+		zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_DATASET);
+		if (zhp == NULL)
+			return (1);
+
+		if (fromname != NULL &&
+		    (fromname[0] == '#' || fromname[0] == '@')) {
+			/*
+			 * Incremental source name begins with # or @.
+			 * Default to same fs as target.
+			 */
+			(void) strncpy(frombuf, argv[0], sizeof (frombuf));
+			cp = strchr(frombuf, '@');
+			if (cp != NULL)
+				*cp = '\0';
+			(void) strlcat(frombuf, fromname, sizeof (frombuf));
+			fromname = frombuf;
+		}
+		err = zfs_send_one(zhp, fromname, STDOUT_FILENO);
+		zfs_close(zhp);
+		return (err != 0);
 	}
+
+	cp = strchr(argv[0], '@');
 	*cp = '\0';
 	toname = cp + 1;
 	zhp = zfs_open(g_zfs, argv[0], ZFS_TYPE_FILESYSTEM | ZFS_TYPE_VOLUME);
@@ -3876,6 +3969,7 @@ zfs_do_receive(int argc, char **argv)
 #define	ZFS_DELEG_PERM_HOLD		"hold"
 #define	ZFS_DELEG_PERM_RELEASE		"release"
 #define	ZFS_DELEG_PERM_DIFF		"diff"
+#define	ZFS_DELEG_PERM_BOOKMARK		"bookmark"

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

More information about the svn-src-projects mailing list