svn commit: r268394 - in user/attilio/rm_vmobj_cache: . bin/mv bin/rm bin/sh cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zpool cddl/contrib/openso...

Tue Jul 8 12:46:37 UTC 2014

Author: attilio
Date: Tue Jul  8 12:46:33 2014
New Revision: 268394
URL: http://svnweb.freebsd.org/changeset/base/268394

Log:
  Merge from head.

Added:
  user/attilio/rm_vmobj_cache/lib/libthr/plockstat.d
     - copied unchanged from r268373, head/lib/libthr/plockstat.d
  user/attilio/rm_vmobj_cache/sbin/camcontrol/persist.c
     - copied unchanged from r268373, head/sbin/camcontrol/persist.c
  user/attilio/rm_vmobj_cache/sys/cddl/boot/zfs/blkptr.c
     - copied unchanged from r268373, head/sys/cddl/boot/zfs/blkptr.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
     - copied unchanged from r268373, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
     - copied unchanged from r268373, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h
  user/attilio/rm_vmobj_cache/sys/rpc/clnt_bck.c
     - copied unchanged from r268373, head/sys/rpc/clnt_bck.c
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/R32
     - copied unchanged from r268373, head/tools/tools/nanobsd/rescue/R32
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/R64
     - copied unchanged from r268373, head/tools/tools/nanobsd/rescue/R64
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/vhd.c
     - copied unchanged from r268373, head/usr.bin/mkimg/vhd.c
Replaced:
  user/attilio/rm_vmobj_cache/release/amd64/make-memstick.sh
     - copied unchanged from r268373, head/release/amd64/make-memstick.sh
Deleted:
  user/attilio/rm_vmobj_cache/etc/etc.ia64/
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/as/ia64-freebsd/
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/ld/Makefile.ia64
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile.ia64
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
  user/attilio/rm_vmobj_cache/gnu/usr.bin/gdb/arch/ia64/
  user/attilio/rm_vmobj_cache/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
  user/attilio/rm_vmobj_cache/lib/clang/include/IA64GenAsmWriter.inc
  user/attilio/rm_vmobj_cache/lib/clang/include/IA64GenDAGISel.inc
  user/attilio/rm_vmobj_cache/lib/clang/include/IA64GenInstrInfo.inc
  user/attilio/rm_vmobj_cache/lib/clang/include/IA64GenRegisterInfo.inc
  user/attilio/rm_vmobj_cache/lib/csu/ia64/
  user/attilio/rm_vmobj_cache/lib/libc/ia64/
  user/attilio/rm_vmobj_cache/lib/libkvm/kvm_ia64.c
  user/attilio/rm_vmobj_cache/lib/libthr/arch/ia64/
  user/attilio/rm_vmobj_cache/lib/libthread_db/arch/ia64/
  user/attilio/rm_vmobj_cache/lib/msun/ia64/
  user/attilio/rm_vmobj_cache/libexec/rtld-elf/ia64/
  user/attilio/rm_vmobj_cache/release/amd64/make-uefi-memstick.sh
  user/attilio/rm_vmobj_cache/release/amd64/mkisoimages-uefi.sh
  user/attilio/rm_vmobj_cache/release/ia64/
  user/attilio/rm_vmobj_cache/sbin/Makefile.ia64
  user/attilio/rm_vmobj_cache/sbin/mca/
  user/attilio/rm_vmobj_cache/secure/lib/libcrypto/opensslconf-ia64.h
  user/attilio/rm_vmobj_cache/sys/amd64/conf/VT
  user/attilio/rm_vmobj_cache/sys/boot/Makefile.ia64
  user/attilio/rm_vmobj_cache/sys/boot/efi/include/ia64/
  user/attilio/rm_vmobj_cache/sys/boot/ficl/ia64/
  user/attilio/rm_vmobj_cache/sys/boot/ia64/
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/atomic/ia64/
  user/attilio/rm_vmobj_cache/sys/conf/Makefile.ia64
  user/attilio/rm_vmobj_cache/sys/conf/files.ia64
  user/attilio/rm_vmobj_cache/sys/conf/ldscript.ia64
  user/attilio/rm_vmobj_cache/sys/conf/options.ia64
  user/attilio/rm_vmobj_cache/sys/contrib/ia64/
  user/attilio/rm_vmobj_cache/sys/dev/hwpmc/hwpmc_ia64.c
  user/attilio/rm_vmobj_cache/sys/dev/uart/uart_cpu_ia64.c
  user/attilio/rm_vmobj_cache/sys/i386/conf/VT
  user/attilio/rm_vmobj_cache/sys/ia64/
  user/attilio/rm_vmobj_cache/sys/libkern/ia64/
  user/attilio/rm_vmobj_cache/sys/xen/interface/arch-ia64/
  user/attilio/rm_vmobj_cache/sys/xen/interface/arch-ia64.h
  user/attilio/rm_vmobj_cache/tools/regression/ia64/
  user/attilio/rm_vmobj_cache/tools/tools/gdb_regofs/ia64.c
  user/attilio/rm_vmobj_cache/usr.bin/Makefile.ia64
  user/attilio/rm_vmobj_cache/usr.bin/gprof/ia64.h
  user/attilio/rm_vmobj_cache/usr.bin/truss/ia64-fbsd.c
  user/attilio/rm_vmobj_cache/usr.bin/xlint/arch/ia64/
  user/attilio/rm_vmobj_cache/usr.sbin/Makefile.ia64
Modified:
  user/attilio/rm_vmobj_cache/Makefile
  user/attilio/rm_vmobj_cache/Makefile.inc1
  user/attilio/rm_vmobj_cache/ObsoleteFiles.inc
  user/attilio/rm_vmobj_cache/UPDATING
  user/attilio/rm_vmobj_cache/bin/mv/mv.c
  user/attilio/rm_vmobj_cache/bin/rm/rm.c
  user/attilio/rm_vmobj_cache/bin/sh/miscbltin.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_compat.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/attilio/rm_vmobj_cache/cddl/lib/libzpool/Makefile
  user/attilio/rm_vmobj_cache/cddl/sbin/zpool/Makefile
  user/attilio/rm_vmobj_cache/cddl/usr.bin/zinject/Makefile
  user/attilio/rm_vmobj_cache/cddl/usr.sbin/zdb/Makefile
  user/attilio/rm_vmobj_cache/cddl/usr.sbin/zhack/Makefile
  user/attilio/rm_vmobj_cache/contrib/ipfilter/lib/printhost.c
  user/attilio/rm_vmobj_cache/contrib/ipfilter/lib/printhostmask.c
  user/attilio/rm_vmobj_cache/contrib/ipfilter/lib/save_v1trap.c
  user/attilio/rm_vmobj_cache/contrib/ipfilter/lib/save_v2trap.c
  user/attilio/rm_vmobj_cache/games/fortune/datfiles/fortunes
  user/attilio/rm_vmobj_cache/gnu/lib/csu/Makefile
  user/attilio/rm_vmobj_cache/gnu/lib/libgcc/Makefile
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/ld/Makefile
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/Makefile
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/libbfd/bfd.h
  user/attilio/rm_vmobj_cache/gnu/usr.bin/cc/Makefile.tgt
  user/attilio/rm_vmobj_cache/gnu/usr.bin/cc/include/Makefile
  user/attilio/rm_vmobj_cache/lib/Makefile
  user/attilio/rm_vmobj_cache/lib/libarchive/Makefile
  user/attilio/rm_vmobj_cache/lib/libc/Makefile
  user/attilio/rm_vmobj_cache/lib/libc/gen/tls.c
  user/attilio/rm_vmobj_cache/lib/libc/locale/utf8.c
  user/attilio/rm_vmobj_cache/lib/libc/mips/arith.h
  user/attilio/rm_vmobj_cache/lib/libc/regex/re_format.7
  user/attilio/rm_vmobj_cache/lib/libc/regex/regcomp.c
  user/attilio/rm_vmobj_cache/lib/libc/stdlib/getopt.3
  user/attilio/rm_vmobj_cache/lib/libc/sys/utimes.2
  user/attilio/rm_vmobj_cache/lib/libc/xdr/xdr_float.c
  user/attilio/rm_vmobj_cache/lib/libkvm/kvm_amd64.c
  user/attilio/rm_vmobj_cache/lib/libkvm/kvm_i386.c
  user/attilio/rm_vmobj_cache/lib/libstand/Makefile
  user/attilio/rm_vmobj_cache/lib/msun/sparc64/fenv.h
  user/attilio/rm_vmobj_cache/lib/msun/src/math.h
  user/attilio/rm_vmobj_cache/lib/ncurses/ncurses/Makefile
  user/attilio/rm_vmobj_cache/libexec/rtld-elf/arm/rtld_start.S
  user/attilio/rm_vmobj_cache/libexec/rtld-elf/rtld.c
  user/attilio/rm_vmobj_cache/release/Makefile
  user/attilio/rm_vmobj_cache/release/amd64/mkisoimages.sh
  user/attilio/rm_vmobj_cache/release/arm/release.sh
  user/attilio/rm_vmobj_cache/release/doc/README
  user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/hardware/article.xml
  user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/readme/article.xml
  user/attilio/rm_vmobj_cache/release/doc/en_US.ISO8859-1/relnotes/article.xml
  user/attilio/rm_vmobj_cache/release/doc/share/examples/Makefile.relnotesng
  user/attilio/rm_vmobj_cache/release/doc/share/misc/dev.archlist.txt
  user/attilio/rm_vmobj_cache/release/doc/share/xml/release.ent
  user/attilio/rm_vmobj_cache/rescue/rescue/Makefile
  user/attilio/rm_vmobj_cache/sbin/bsdlabel/bsdlabel.8
  user/attilio/rm_vmobj_cache/sbin/bsdlabel/bsdlabel.c
  user/attilio/rm_vmobj_cache/sbin/camcontrol/Makefile
  user/attilio/rm_vmobj_cache/sbin/camcontrol/camcontrol.8
  user/attilio/rm_vmobj_cache/sbin/camcontrol/camcontrol.c
  user/attilio/rm_vmobj_cache/sbin/camcontrol/camcontrol.h
  user/attilio/rm_vmobj_cache/sbin/etherswitchcfg/etherswitchcfg.c
  user/attilio/rm_vmobj_cache/sbin/fdisk/fdisk.c
  user/attilio/rm_vmobj_cache/sbin/geom/class/part/gpart.8
  user/attilio/rm_vmobj_cache/sbin/ifconfig/af_inet6.c
  user/attilio/rm_vmobj_cache/share/dict/freebsd
  user/attilio/rm_vmobj_cache/share/examples/etc/make.conf
  user/attilio/rm_vmobj_cache/share/man/man4/acpi.4
  user/attilio/rm_vmobj_cache/share/man/man4/aout.4
  user/attilio/rm_vmobj_cache/share/man/man4/inet.4
  user/attilio/rm_vmobj_cache/share/man/man4/smp.4
  user/attilio/rm_vmobj_cache/share/man/man4/syscons.4
  user/attilio/rm_vmobj_cache/share/man/man4/vt.4
  user/attilio/rm_vmobj_cache/share/man/man5/src.conf.5
  user/attilio/rm_vmobj_cache/share/man/man9/atomic.9
  user/attilio/rm_vmobj_cache/share/man/man9/get_cyclecount.9
  user/attilio/rm_vmobj_cache/share/man/man9/timeout.9
  user/attilio/rm_vmobj_cache/share/mk/bsd.cpu.mk
  user/attilio/rm_vmobj_cache/share/mk/bsd.dep.mk
  user/attilio/rm_vmobj_cache/share/mk/bsd.endian.mk
  user/attilio/rm_vmobj_cache/share/mk/bsd.lib.mk
  user/attilio/rm_vmobj_cache/share/mk/bsd.sys.mk
  user/attilio/rm_vmobj_cache/sys/Makefile
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/machdep.c
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/pmap.c
  user/attilio/rm_vmobj_cache/sys/amd64/amd64/trap.c
  user/attilio/rm_vmobj_cache/sys/amd64/conf/GENERIC
  user/attilio/rm_vmobj_cache/sys/amd64/conf/NOTES
  user/attilio/rm_vmobj_cache/sys/boot/amd64/efi/bootinfo.c
  user/attilio/rm_vmobj_cache/sys/boot/common/Makefile.inc
  user/attilio/rm_vmobj_cache/sys/boot/efi/include/amd64/pe.h
  user/attilio/rm_vmobj_cache/sys/boot/efi/include/efiapi.h
  user/attilio/rm_vmobj_cache/sys/boot/efi/include/i386/pe.h
  user/attilio/rm_vmobj_cache/sys/boot/ficl/loader.c
  user/attilio/rm_vmobj_cache/sys/boot/forth/loader.conf
  user/attilio/rm_vmobj_cache/sys/boot/libstand32/Makefile
  user/attilio/rm_vmobj_cache/sys/boot/userboot/libstand/Makefile
  user/attilio/rm_vmobj_cache/sys/boot/zfs/zfsimpl.c
  user/attilio/rm_vmobj_cache/sys/cam/ata/ata_da.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_block.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_backend_ramdisk.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_cmd_table.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_error.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_cam_sim.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_internal.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_iscsi.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_frontend_iscsi.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_io.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_ioctl.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_private.h
  user/attilio/rm_vmobj_cache/sys/cam/ctl/ctl_util.c
  user/attilio/rm_vmobj_cache/sys/cam/ctl/scsi_ctl.c
  user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_all.c
  user/attilio/rm_vmobj_cache/sys/cam/scsi/scsi_all.h
  user/attilio/rm_vmobj_cache/sys/cddl/boot/zfs/README
  user/attilio/rm_vmobj_cache/sys/cddl/boot/zfs/zfsimpl.h
  user/attilio/rm_vmobj_cache/sys/cddl/boot/zfs/zfssubr.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  user/attilio/rm_vmobj_cache/sys/compat/freebsd32/freebsd32_misc.c
  user/attilio/rm_vmobj_cache/sys/compat/freebsd32/freebsd32_util.h
  user/attilio/rm_vmobj_cache/sys/compat/ia32/ia32_util.h
  user/attilio/rm_vmobj_cache/sys/compat/ndis/pe_var.h
  user/attilio/rm_vmobj_cache/sys/conf/NOTES
  user/attilio/rm_vmobj_cache/sys/conf/files
  user/attilio/rm_vmobj_cache/sys/conf/files.sparc64
  user/attilio/rm_vmobj_cache/sys/conf/kern.mk
  user/attilio/rm_vmobj_cache/sys/conf/options
  user/attilio/rm_vmobj_cache/sys/contrib/dev/acpica/acpica_prep.sh
  user/attilio/rm_vmobj_cache/sys/dev/acpica/acpi_hpet.c
  user/attilio/rm_vmobj_cache/sys/dev/amr/amrio.h
  user/attilio/rm_vmobj_cache/sys/dev/asmc/asmc.c
  user/attilio/rm_vmobj_cache/sys/dev/asmc/asmcvar.h
  user/attilio/rm_vmobj_cache/sys/dev/ata/chipsets/ata-ati.c
  user/attilio/rm_vmobj_cache/sys/dev/ath/if_ath_ahb.c
  user/attilio/rm_vmobj_cache/sys/dev/ath/if_ath_pci.c
  user/attilio/rm_vmobj_cache/sys/dev/atkbdc/atkbdc.c
  user/attilio/rm_vmobj_cache/sys/dev/bge/if_bge.c
  user/attilio/rm_vmobj_cache/sys/dev/drm/drm.h
  user/attilio/rm_vmobj_cache/sys/dev/drm/drm_sarea.h
  user/attilio/rm_vmobj_cache/sys/dev/drm2/drm.h
  user/attilio/rm_vmobj_cache/sys/dev/drm2/drm_sarea.h
  user/attilio/rm_vmobj_cache/sys/dev/e1000/if_igb.c
  user/attilio/rm_vmobj_cache/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  user/attilio/rm_vmobj_cache/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h
  user/attilio/rm_vmobj_cache/sys/dev/fb/fbreg.h
  user/attilio/rm_vmobj_cache/sys/dev/hwpmc/hwpmc_powerpc.c
  user/attilio/rm_vmobj_cache/sys/dev/iscsi/iscsi.c
  user/attilio/rm_vmobj_cache/sys/dev/iscsi/iscsi.h
  user/attilio/rm_vmobj_cache/sys/dev/iscsi/iscsi_ioctl.h
  user/attilio/rm_vmobj_cache/sys/dev/ixgbe/ixgbe.c
  user/attilio/rm_vmobj_cache/sys/dev/mge/if_mge.c
  user/attilio/rm_vmobj_cache/sys/dev/mps/mps.c
  user/attilio/rm_vmobj_cache/sys/dev/mps/mps_sas.c
  user/attilio/rm_vmobj_cache/sys/dev/mps/mps_sas.h
  user/attilio/rm_vmobj_cache/sys/dev/mps/mps_user.c
  user/attilio/rm_vmobj_cache/sys/dev/mps/mpsvar.h
  user/attilio/rm_vmobj_cache/sys/dev/nfe/if_nfe.c
  user/attilio/rm_vmobj_cache/sys/dev/oce/oce_if.c
  user/attilio/rm_vmobj_cache/sys/dev/pci/vga_pci.c
  user/attilio/rm_vmobj_cache/sys/dev/sound/pcm/pcm.h
  user/attilio/rm_vmobj_cache/sys/dev/sym/sym_hipd.c
  user/attilio/rm_vmobj_cache/sys/dev/tws/tws.c
  user/attilio/rm_vmobj_cache/sys/dev/txp/if_txp.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/xhci_pci.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/controller/xhcireg.h
  user/attilio/rm_vmobj_cache/sys/dev/usb/net/if_axge.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/net/uhso.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/serial/usb_serial.c
  user/attilio/rm_vmobj_cache/sys/dev/usb/serial/usb_serial.h
  user/attilio/rm_vmobj_cache/sys/dev/vmware/vmxnet3/if_vmx.c
  user/attilio/rm_vmobj_cache/sys/dev/vt/hw/ofwfb/ofwfb.c
  user/attilio/rm_vmobj_cache/sys/dev/vt/hw/vga/vt_vga.c
  user/attilio/rm_vmobj_cache/sys/fs/nandfs/nandfs.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfs.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfs_commonkrpc.c
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfs_commonport.c
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfs_commonsubs.c
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfs_var.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfsclstate.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfsdport.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfsport.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfsproto.h
  user/attilio/rm_vmobj_cache/sys/fs/nfs/nfsrvstate.h
  user/attilio/rm_vmobj_cache/sys/fs/nfsclient/nfs_clstate.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdcache.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdkrpc.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdport.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdserv.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdsocket.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdstate.c
  user/attilio/rm_vmobj_cache/sys/fs/nfsserver/nfs_nfsdsubs.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part.h
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_apm.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_gpt.c
  user/attilio/rm_vmobj_cache/sys/geom/part/g_part_mbr.c
  user/attilio/rm_vmobj_cache/sys/i386/conf/GENERIC
  user/attilio/rm_vmobj_cache/sys/i386/conf/NOTES
  user/attilio/rm_vmobj_cache/sys/i386/i386/pmap.c
  user/attilio/rm_vmobj_cache/sys/i386/i386/trap.c
  user/attilio/rm_vmobj_cache/sys/i386/xen/pmap.c
  user/attilio/rm_vmobj_cache/sys/kern/imgact_elf.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_cons.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_exec.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_ktr.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_lockf.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_sig.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_sysctl.c
  user/attilio/rm_vmobj_cache/sys/kern/kern_thread.c
  user/attilio/rm_vmobj_cache/sys/kern/link_elf.c
  user/attilio/rm_vmobj_cache/sys/kern/sched_ule.c
  user/attilio/rm_vmobj_cache/sys/kern/subr_rman.c
  user/attilio/rm_vmobj_cache/sys/kern/subr_witness.c
  user/attilio/rm_vmobj_cache/sys/mips/atheros/if_arge.c
  user/attilio/rm_vmobj_cache/sys/mips/mips/pmap.c
  user/attilio/rm_vmobj_cache/sys/modules/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/acpi/acpi/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/dtrace/fasttrap/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/hwpmc/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/krpc/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/ppc/Makefile
  user/attilio/rm_vmobj_cache/sys/modules/sound/sound/Makefile
  user/attilio/rm_vmobj_cache/sys/netgraph/ng_eiface.c
  user/attilio/rm_vmobj_cache/sys/netinet/ip_output.c
  user/attilio/rm_vmobj_cache/sys/netinet/tcp_input.c
  user/attilio/rm_vmobj_cache/sys/netinet/tcp_output.c
  user/attilio/rm_vmobj_cache/sys/netinet6/in6_pcbgroup.c
  user/attilio/rm_vmobj_cache/sys/netipsec/ipsec_output.c
  user/attilio/rm_vmobj_cache/sys/nfsserver/nfs_serv.c
  user/attilio/rm_vmobj_cache/sys/ofed/drivers/infiniband/hw/mlx4/main.c
  user/attilio/rm_vmobj_cache/sys/ofed/drivers/infiniband/hw/mlx4/mcg.c
  user/attilio/rm_vmobj_cache/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
  user/attilio/rm_vmobj_cache/sys/ofed/drivers/net/mlx4/en_main.c
  user/attilio/rm_vmobj_cache/sys/ofed/drivers/net/mlx4/main.c
  user/attilio/rm_vmobj_cache/sys/ofed/include/linux/module.h
  user/attilio/rm_vmobj_cache/sys/powerpc/include/endian.h
  user/attilio/rm_vmobj_cache/sys/powerpc/include/spr.h
  user/attilio/rm_vmobj_cache/sys/powerpc/powerpc/cpu.c
  user/attilio/rm_vmobj_cache/sys/rpc/krpc.h
  user/attilio/rm_vmobj_cache/sys/rpc/svc.h
  user/attilio/rm_vmobj_cache/sys/rpc/svc_vc.c
  user/attilio/rm_vmobj_cache/sys/sparc64/sparc64/pmap.c
  user/attilio/rm_vmobj_cache/sys/sys/buf.h
  user/attilio/rm_vmobj_cache/sys/sys/cdefs.h
  user/attilio/rm_vmobj_cache/sys/sys/cons.h
  user/attilio/rm_vmobj_cache/sys/sys/disklabel.h
  user/attilio/rm_vmobj_cache/sys/sys/efi.h
  user/attilio/rm_vmobj_cache/sys/sys/fnv_hash.h
  user/attilio/rm_vmobj_cache/sys/sys/gpt.h
  user/attilio/rm_vmobj_cache/sys/sys/kerneldump.h
  user/attilio/rm_vmobj_cache/sys/sys/linker_set.h
  user/attilio/rm_vmobj_cache/sys/sys/param.h
  user/attilio/rm_vmobj_cache/sys/sys/sysctl.h
  user/attilio/rm_vmobj_cache/sys/sys/sysent.h
  user/attilio/rm_vmobj_cache/sys/vm/pmap.h
  user/attilio/rm_vmobj_cache/sys/vm/vm_mmap.c
  user/attilio/rm_vmobj_cache/sys/vm/vm_pageout.c
  user/attilio/rm_vmobj_cache/sys/vm/vm_unix.c
  user/attilio/rm_vmobj_cache/sys/x86/include/segments.h
  user/attilio/rm_vmobj_cache/sys/x86/iommu/intel_drv.c
  user/attilio/rm_vmobj_cache/tools/build/mk/OptionalObsoleteFiles.inc
  user/attilio/rm_vmobj_cache/tools/regression/README
  user/attilio/rm_vmobj_cache/tools/regression/file/flock/flock.c
  user/attilio/rm_vmobj_cache/tools/regression/filemon/Makefile
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/build.sh
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/common
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/merge.sh
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/rescue_amd64.conf
  user/attilio/rm_vmobj_cache/tools/tools/nanobsd/rescue/rescue_i386.conf
  user/attilio/rm_vmobj_cache/usr.bin/calendar/calendars/calendar.holiday
  user/attilio/rm_vmobj_cache/usr.bin/gprof/gprof.h
  user/attilio/rm_vmobj_cache/usr.bin/look/look.1
  user/attilio/rm_vmobj_cache/usr.bin/look/look.c
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/Makefile
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/gpt.c
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/image.c
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/image.h
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/mkimg.1
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/mkimg.c
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/mkimg.h
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/raw.c
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/vmdk.c
  user/attilio/rm_vmobj_cache/usr.bin/sed/main.c
  user/attilio/rm_vmobj_cache/usr.bin/showmount/showmount.8
  user/attilio/rm_vmobj_cache/usr.bin/svn/svn/Makefile
  user/attilio/rm_vmobj_cache/usr.bin/truss/extern.h
  user/attilio/rm_vmobj_cache/usr.bin/truss/main.c
  user/attilio/rm_vmobj_cache/usr.bin/units/units.1
  user/attilio/rm_vmobj_cache/usr.bin/units/units.c
  user/attilio/rm_vmobj_cache/usr.bin/units/units.lib
  user/attilio/rm_vmobj_cache/usr.bin/vtfontcvt/vtfontcvt.c
  user/attilio/rm_vmobj_cache/usr.bin/xlint/lint1/param.h
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/virtio.c
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/virtio.h
  user/attilio/rm_vmobj_cache/usr.sbin/bsdinstall/partedit/partedit_powerpc.c
  user/attilio/rm_vmobj_cache/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
  user/attilio/rm_vmobj_cache/usr.sbin/config/config.5
  user/attilio/rm_vmobj_cache/usr.sbin/crunch/crunchide/Makefile
  user/attilio/rm_vmobj_cache/usr.sbin/crunch/crunchide/exec_elf32.c
  user/attilio/rm_vmobj_cache/usr.sbin/ctladm/ctladm.8
  user/attilio/rm_vmobj_cache/usr.sbin/ctladm/ctladm.c
  user/attilio/rm_vmobj_cache/usr.sbin/ctld/ctld.c
  user/attilio/rm_vmobj_cache/usr.sbin/ctld/ctld.h
  user/attilio/rm_vmobj_cache/usr.sbin/ctld/kernel.c
  user/attilio/rm_vmobj_cache/usr.sbin/ctld/login.c
  user/attilio/rm_vmobj_cache/usr.sbin/gstat/gstat.8
  user/attilio/rm_vmobj_cache/usr.sbin/gstat/gstat.c
  user/attilio/rm_vmobj_cache/usr.sbin/iscsid/iscsid.c
  user/attilio/rm_vmobj_cache/usr.sbin/iscsid/iscsid.h
  user/attilio/rm_vmobj_cache/usr.sbin/iscsid/login.c
  user/attilio/rm_vmobj_cache/usr.sbin/kbdcontrol/kbdcontrol.c
  user/attilio/rm_vmobj_cache/usr.sbin/mergemaster/mergemaster.sh
  user/attilio/rm_vmobj_cache/usr.sbin/ntp/config.h
  user/attilio/rm_vmobj_cache/usr.sbin/pkg/elf_tables.h
  user/attilio/rm_vmobj_cache/usr.sbin/uhsoctl/uhsoctl.c
  user/attilio/rm_vmobj_cache/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
  user/attilio/rm_vmobj_cache/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  user/attilio/rm_vmobj_cache/contrib/ipfilter/   (props changed)
  user/attilio/rm_vmobj_cache/etc/   (props changed)
  user/attilio/rm_vmobj_cache/gnu/lib/   (props changed)
  user/attilio/rm_vmobj_cache/gnu/usr.bin/binutils/   (props changed)
  user/attilio/rm_vmobj_cache/gnu/usr.bin/gdb/   (props changed)
  user/attilio/rm_vmobj_cache/lib/libc/   (props changed)
  user/attilio/rm_vmobj_cache/sbin/   (props changed)
  user/attilio/rm_vmobj_cache/share/   (props changed)
  user/attilio/rm_vmobj_cache/share/man/man4/   (props changed)
  user/attilio/rm_vmobj_cache/sys/   (props changed)
  user/attilio/rm_vmobj_cache/sys/boot/   (props changed)
  user/attilio/rm_vmobj_cache/sys/cddl/contrib/opensolaris/   (props changed)
  user/attilio/rm_vmobj_cache/sys/conf/   (props changed)
  user/attilio/rm_vmobj_cache/sys/contrib/dev/acpica/   (props changed)
  user/attilio/rm_vmobj_cache/usr.bin/calendar/   (props changed)
  user/attilio/rm_vmobj_cache/usr.bin/mkimg/   (props changed)
  user/attilio/rm_vmobj_cache/usr.sbin/bhyve/   (props changed)

Modified: user/attilio/rm_vmobj_cache/Makefile
==============================================================================

--- user/attilio/rm_vmobj_cache/Makefile	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/Makefile	Tue Jul  8 12:46:33 2014	(r268394)
@@ -82,7 +82,7 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can
+# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can
 # cross build world for other machine types using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
@@ -361,7 +361,7 @@ kernel-toolchains:
 # existing system is.
 #
 .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets)
-TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64
+TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64
 TARGET_ARCHES_arm?=	arm armeb armv6 armv6hf
 TARGET_ARCHES_mips?=	mipsel mips mips64el mips64 mipsn32
 TARGET_ARCHES_powerpc?=	powerpc powerpc64

Modified: user/attilio/rm_vmobj_cache/Makefile.inc1
==============================================================================
--- user/attilio/rm_vmobj_cache/Makefile.inc1	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/Makefile.inc1	Tue Jul  8 12:46:33 2014	(r268394)
@@ -140,7 +140,7 @@ SRCRELDATE!=	awk '/^\#define[[:space:]]*
 VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
-KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
+KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
 .if ${TARGET} == ${TARGET_ARCH}
 _t=		${TARGET}
 .else
@@ -782,6 +782,11 @@ EXTRA_DISTRIBUTIONS+=	lib32
 EXTRA_DISTRIBUTIONS+=	tests
 .endif
 
+DEBUG_DISTRIBUTIONS=
+.if ${MK_DEBUG_FILES} != "no"
+DEBUG_DISTRIBUTIONS+=	base ${EXTRA_DISTRIBUTIONS:S,doc,,}
+.endif
+
 MTREE_MAGIC?=	mtree 2.0
 
 distributeworld installworld: _installcheck_world
@@ -858,8 +863,7 @@ distributeworld installworld: _installch
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
-.if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
+.for dist in ${DEBUG_DISTRIBUTIONS}
 	@# For each file that exists in this dist, print the corresponding
 	@# line from the METALOG.  This relies on the fact that
 	@# a line containing only the filename will sort immediatly before
@@ -868,8 +872,7 @@ distributeworld installworld: _installch
 	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
-. endfor
-.endif
+.endfor
 .endif
 .endif
 
@@ -887,19 +890,17 @@ packageworld:
 .endif
 .endfor
 
-.if ${MK_DEBUG_FILES} != "no"
-. for dist in base ${EXTRA_DISTRIBUTIONS}
-.  if defined(NO_ROOT)
+.for dist in ${DEBUG_DISTRIBUTIONS}
+. if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
-.  else
+. else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}-dbg.txz \
 	    usr/lib/debug
-.  endif
-. endfor
-.endif
+. endif
+.endfor
 
 #
 # reinstall

Modified: user/attilio/rm_vmobj_cache/ObsoleteFiles.inc
==============================================================================
--- user/attilio/rm_vmobj_cache/ObsoleteFiles.inc	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/ObsoleteFiles.inc	Tue Jul  8 12:46:33 2014	(r268394)
@@ -559,6 +559,7 @@ OLD_FILES+=usr/share/man/man9/vfs_mount.
 OLD_FILES+=usr/bin/cvs
 OLD_FILES+=usr/bin/cvsbug
 OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ascii.gz
+OLD_FILES+=usr/share/doc/psd/28.cvs/paper.ps.gz
 OLD_DIRS+=usr/share/doc/psd/28.cvs
 OLD_FILES+=usr/share/examples/cvs/contrib/README
 OLD_FILES+=usr/share/examples/cvs/contrib/clmerge
@@ -1179,9 +1180,6 @@ OLD_FILES+=usr/include/xmmintrin.h
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm"
 OLD_FILES+=usr/include/mmintrin.h
 .endif
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/ia64intrin.h
-.endif
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/altivec.h
 OLD_FILES+=usr/include/ppc-asm.h
@@ -1199,10 +1197,6 @@ OLD_FILES+=usr/include/machine/rm7000.h
 OLD_FILES+=usr/include/machine/defs.h
 OLD_FILES+=usr/include/machine/queue.h
 .endif
-# 20100326: [ia64] removed <machine/nexusvar.h>
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/machine/nexusvar.h
-.endif
 # 20100326: gcpio removal
 OLD_FILES+=usr/bin/gcpio
 OLD_FILES+=usr/share/info/cpio.info.gz
@@ -1216,11 +1210,6 @@ OLD_FILES+=usr/share/man/man3/regexp.3.g
 OLD_FILES+=usr/share/man/man3/regsub.3.gz
 # 20100303: actual removal of utmp.h
 OLD_FILES+=usr/include/utmp.h
-# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h>
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=usr/include/machine/sapicreg.h
-OLD_FILES+=usr/include/machine/sapicvar.h
-.endif
 # 20100208: man pages moved
 .if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz
@@ -1913,14 +1902,6 @@ OLD_FILES+=usr/share/man/man8/arlcontrol
 OLD_FILES+=sbin/sunlabel
 OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
 .endif
-# 20080703: bsdlabel & fdisk removed on ia64
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=sbin/bsdlabel
-OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz
-OLD_FILES+=usr/share/man/man8/disklabel.8.gz
-OLD_FILES+=sbin/fdisk
-OLD_FILES+=usr/share/man/man8/fdisk.8.gz
-.endif
 # 20080701: wpa_supplicant.conf moved to share/examples/etc/
 OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf
 OLD_DIRS+=usr/share/examples/wpa_supplicant
@@ -2129,12 +2110,6 @@ OLD_FILES+=usr/include/sys/_elf_solaris.
 OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz
 # 20071108: Removed very crunch OLDCARD support file
 OLD_FILES+=etc/defaults/pccard.conf
-# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64.
-.if ${TARGET_ARCH} == "ia64"
-OLD_FILES+=rescue/bsdlabel
-OLD_FILES+=rescue/fdisk
-OLD_FILES+=rescue/gpt
-.endif
 # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
 OLD_FILES+=etc/rc.d/nfslocking
 # 20070930: rename of cached to nscd
@@ -2795,10 +2770,6 @@ OLD_FILES+=usr/share/man/man8/mount_std.
 OLD_FILES+=usr/share/man/man4/uhidev.4.gz
 # 20061106: archive_write_prepare.3 removed
 OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz
-.if ${TARGET_ARCH} == "ia64"
-# 20061104: skiload.help removed
-OLD_FILES+=boot/skiload.help
-.endif
 # 20061018: pccardc removed
 OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz
 # 20060930: demangle.h from contrib/libstdc++/include/ext/

Modified: user/attilio/rm_vmobj_cache/UPDATING
==============================================================================
--- user/attilio/rm_vmobj_cache/UPDATING	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/UPDATING	Tue Jul  8 12:46:33 2014	(r268394)
@@ -31,6 +31,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20140702:
+	The Itanium architecture (ia64) has been removed from the list of
+	known architectures. This is the first step in the removal of the
+	architecture.
+
+20140701:
+	Commit r268115 has added NFSv4.1 server support, merged from
+	projects/nfsv4.1-server.  Since this includes changes to the
+	internal interfaces between the NFS related modules, a full
+	build of the kernel and modules will be necessary.
+	__FreeBSD_version has been bumped.
+
 20140629:
 	The WITHOUT_VT_SUPPORT kernel config knob has been renamed
 	WITHOUT_VT.  (The other _SUPPORT knobs have a consistent meaning

Modified: user/attilio/rm_vmobj_cache/bin/mv/mv.c
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/mv/mv.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/bin/mv/mv.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -278,6 +278,7 @@ fastcopy(const char *from, const char *t
 	static char *bp = NULL;
 	mode_t oldmode;
 	int nread, from_fd, to_fd;
+	struct stat tsb;
 
 	if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
 		warn("fastcopy: open() failed (from): %s", from);
@@ -336,10 +337,18 @@ err:		if (unlink(to))
 	 * if the server supports flags and we were trying to *remove* flags
 	 * on a file that we copied, i.e., that we didn't create.)
 	 */
-	errno = 0;
-	if (fchflags(to_fd, sbp->st_flags | UF_ARCHIVE))
-		if (errno != EOPNOTSUPP || ((sbp->st_flags & ~UF_ARCHIVE) != 0))
-			warn("%s: set flags (was: 0%07o)", to, sbp->st_flags);
+	if (fstat(to_fd, &tsb) == 0) {
+		if ((sbp->st_flags  & ~UF_ARCHIVE) !=
+		    (tsb.st_flags & ~UF_ARCHIVE)) {
+			if (fchflags(to_fd,
+			    sbp->st_flags | (tsb.st_flags & UF_ARCHIVE)))
+				if (errno != EOPNOTSUPP ||
+				    ((sbp->st_flags & ~UF_ARCHIVE) != 0))
+					warn("%s: set flags (was: 0%07o)",
+					    to, sbp->st_flags);
+		}
+	} else
+		warn("%s: cannot stat", to);
 
 	tval[0].tv_sec = sbp->st_atime;
 	tval[1].tv_sec = sbp->st_mtime;

Modified: user/attilio/rm_vmobj_cache/bin/rm/rm.c
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/rm/rm.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/bin/rm/rm.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -335,7 +335,7 @@ err:
 		warn("%s", p->fts_path);
 		eval = 1;
 	}
-	if (errno)
+	if (!fflag && errno)
 		err(1, "fts_read");
 	fts_close(fts);
 }

Modified: user/attilio/rm_vmobj_cache/bin/sh/miscbltin.c
==============================================================================
--- user/attilio/rm_vmobj_cache/bin/sh/miscbltin.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/bin/sh/miscbltin.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -414,7 +414,6 @@ static const struct limits limits[] = {
 int
 ulimitcmd(int argc __unused, char **argv __unused)
 {
-	int	c;
 	rlim_t val = 0;
 	enum { SOFT = 0x1, HARD = 0x2 }
 			how = SOFT | HARD;
@@ -453,17 +452,22 @@ ulimitcmd(int argc __unused, char **argv
 		if (strcmp(p, "unlimited") == 0)
 			val = RLIM_INFINITY;
 		else {
-			val = 0;
+			char *end;
+			uintmax_t uval;
 
-			while ((c = *p++) >= '0' && c <= '9')
-			{
-				val = (val * 10) + (long)(c - '0');
-				if (val < 0)
-					break;
-			}
-			if (c)
+			if (*p < '0' || *p > '9')
+				error("bad number");
+			errno = 0;
+			uval = strtoumax(p, &end, 10);
+			if (errno != 0 || *end != '\0')
+				error("bad number");
+			if (uval > UINTMAX_MAX / l->factor)
+				error("bad number");
+			uval *= l->factor;
+			val = (rlim_t)uval;
+			if (val < 0 || (uintmax_t)val != uval ||
+			    val == RLIM_INFINITY)
 				error("bad number");
-			val *= l->factor;
 		}
 	}
 	if (all) {

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Tue Jul  8 12:46:33 2014	(r268394)
@@ -14,12 +14,12 @@
 .\"
 .\" Copyright 2012, Richard Lowe.
 .\" Copyright (c) 2012, Marcelo Araujo <araujo at FreeBSD.org>.
-.\" Copyright (c) 2012 by Delphix. All rights reserved.
+.\" Copyright (c) 2012, 2014 by Delphix. All rights reserved.
 .\" All Rights Reserved.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 20, 2014
+.Dd July 1, 2014
 .Dt ZDB 8
 .Os
 .Sh NAME
@@ -32,6 +32,7 @@
 .Op Fl t Ar txg
 .Op Fl U Ar cache
 .Op Fl M Ar inflight I/Os
+.Op Fl x Ar dumpdir
 .Ar poolname
 .Op Ar object ...
 .Nm
@@ -217,6 +218,14 @@ Operate on an exported pool, not present
 The
 .Fl p
 flag specifies the path under which devices are to be searched.
+.It Fl x Ar dumpdir
+All blocks accessed will be copied to files in the specified directory.
+The blocks will be placed in sparse files whose name is the same as
+that of the file or device read.  zdb can be then run on the generated files.
+Note that the
+.Fl bbc
+flags are sufficient to access (and thus copy)
+all metadata on the pool.
 .It Fl F
 Attempt to make an unreadable pool readable by trying progressively older
 transactions.

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -75,9 +75,9 @@
 	DMU_OT_ZAP_OTHER : DMU_OT_NUMTYPES))
 
 #ifndef lint
-extern int zfs_recover;
+extern boolean_t zfs_recover;
 #else
-int zfs_recover;
+boolean_t zfs_recover;
 #endif
 
 const char cmdname[] = "zdb";
@@ -112,7 +112,7 @@ usage(void)
 {
 	(void) fprintf(stderr,
 	    "Usage: %s [-CumdibcsDvhLXFPA] [-t txg] [-e [-p path...]] "
-	    "[-U config] [-M inflight I/Os] poolname [object...]\n"
+	    "[-U config] [-M inflight I/Os] [-x dumpdir] poolname [object...]\n"
 	    "       %s [-divPA] [-e -p path...] [-U config] dataset "
 	    "[object...]\n"
 	    "       %s -m [-LXFPA] [-t txg] [-e [-p path...]] [-U config] "
@@ -150,7 +150,7 @@ usage(void)
 	(void) fprintf(stderr, "        -R read and display block from a "
 	    "device\n\n");
 	(void) fprintf(stderr, "    Below options are intended for use "
-	    "with other options (except -l):\n");
+	    "with other options:\n");
 	(void) fprintf(stderr, "        -A ignore assertions (-A), enable "
 	    "panic recovery (-AA) or both (-AAA)\n");
 	(void) fprintf(stderr, "        -F attempt automatic rewind within "
@@ -163,11 +163,14 @@ usage(void)
 	    "has altroot/not in a cachefile\n");
 	(void) fprintf(stderr, "        -p <path> -- use one or more with "
 	    "-e to specify path to vdev dir\n");
-	(void) fprintf(stderr, "	-P print numbers in parseable form\n");
+	(void) fprintf(stderr, "        -x <dumpdir> -- "
+	    "dump all read blocks into specified directory\n");
+	(void) fprintf(stderr, "        -P print numbers in parseable form\n");
 	(void) fprintf(stderr, "        -t <txg> -- highest txg to use when "
 	    "searching for uberblocks\n");
 	(void) fprintf(stderr, "        -M <number of inflight I/Os> -- "
-	    "specify the maximum number of checksumming I/Os [default is 200]");
+	    "specify the maximum number of "
+	    "checksumming I/Os [default is 200]\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -1032,7 +1035,8 @@ dump_dnode(objset_t *os, uint64_t object
 }
 
 static uint64_t
-blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp, const zbookmark_t *zb)
+blkid2offset(const dnode_phys_t *dnp, const blkptr_t *bp,
+    const zbookmark_phys_t *zb)
 {
 	if (dnp == NULL) {
 		ASSERT(zb->zb_level < 0);
@@ -1059,8 +1063,17 @@ snprintf_blkptr_compact(char *blkbuf, si
 		return;
 	}
 
-	blkbuf[0] = '\0';
+	if (BP_IS_EMBEDDED(bp)) {
+		(void) sprintf(blkbuf,
+		    "EMBEDDED et=%u %llxL/%llxP B=%llu",
+		    (int)BPE_GET_ETYPE(bp),
+		    (u_longlong_t)BPE_GET_LSIZE(bp),
+		    (u_longlong_t)BPE_GET_PSIZE(bp),
+		    (u_longlong_t)bp->blk_birth);
+		return;
+	}
 
+	blkbuf[0] = '\0';
 	for (int i = 0; i < ndvas; i++)
 		(void) snprintf(blkbuf + strlen(blkbuf),
 		    buflen - strlen(blkbuf), "%llu:%llx:%llx ",
@@ -1078,21 +1091,23 @@ snprintf_blkptr_compact(char *blkbuf, si
 		    "%llxL/%llxP F=%llu B=%llu/%llu",
 		    (u_longlong_t)BP_GET_LSIZE(bp),
 		    (u_longlong_t)BP_GET_PSIZE(bp),
-		    (u_longlong_t)bp->blk_fill,
+		    (u_longlong_t)BP_GET_FILL(bp),
 		    (u_longlong_t)bp->blk_birth,
 		    (u_longlong_t)BP_PHYSICAL_BIRTH(bp));
 	}
 }
 
 static void
-print_indirect(blkptr_t *bp, const zbookmark_t *zb,
+print_indirect(blkptr_t *bp, const zbookmark_phys_t *zb,
     const dnode_phys_t *dnp)
 {
 	char blkbuf[BP_SPRINTF_LEN];
 	int l;
 
-	ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
-	ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
+	if (!BP_IS_EMBEDDED(bp)) {
+		ASSERT3U(BP_GET_TYPE(bp), ==, dnp->dn_type);
+		ASSERT3U(BP_GET_LEVEL(bp), ==, zb->zb_level);
+	}
 
 	(void) printf("%16llx ", (u_longlong_t)blkid2offset(dnp, bp, zb));
 
@@ -1112,7 +1127,7 @@ print_indirect(blkptr_t *bp, const zbook
 
 static int
 visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
-    blkptr_t *bp, const zbookmark_t *zb)
+    blkptr_t *bp, const zbookmark_phys_t *zb)
 {
 	int err = 0;
 
@@ -1138,7 +1153,7 @@ visit_indirect(spa_t *spa, const dnode_p
 		/* recursively visit blocks below this */
 		cbp = buf->b_data;
 		for (i = 0; i < epb; i++, cbp++) {
-			zbookmark_t czb;
+			zbookmark_phys_t czb;
 
 			SET_BOOKMARK(&czb, zb->zb_objset, zb->zb_object,
 			    zb->zb_level - 1,
@@ -1146,10 +1161,10 @@ visit_indirect(spa_t *spa, const dnode_p
 			err = visit_indirect(spa, dnp, cbp, &czb);
 			if (err)
 				break;
-			fill += cbp->blk_fill;
+			fill += BP_GET_FILL(cbp);
 		}
 		if (!err)
-			ASSERT3U(fill, ==, bp->blk_fill);
+			ASSERT3U(fill, ==, BP_GET_FILL(bp));
 		(void) arc_buf_remove_ref(buf, &buf);
 	}
 
@@ -1162,7 +1177,7 @@ dump_indirect(dnode_t *dn)
 {
 	dnode_phys_t *dnp = dn->dn_phys;
 	int j;
-	zbookmark_t czb;
+	zbookmark_phys_t czb;
 
 	(void) printf("Indirect blocks:\n");
 
@@ -1816,14 +1831,14 @@ dump_dir(objset_t *os)
 
 	if (dds.dds_type == DMU_OST_META) {
 		dds.dds_creation_txg = TXG_INITIAL;
-		usedobjs = os->os_rootbp->blk_fill;
+		usedobjs = BP_GET_FILL(os->os_rootbp);
 		refdbytes = os->os_spa->spa_dsl_pool->
 		    dp_mos_dir->dd_phys->dd_used_bytes;
 	} else {
 		dmu_objset_space(os, &refdbytes, &scratch, &usedobjs, &scratch);
 	}
 
-	ASSERT3U(usedobjs, ==, os->os_rootbp->blk_fill);
+	ASSERT3U(usedobjs, ==, BP_GET_FILL(os->os_rootbp));
 
 	zdb_nicenum(refdbytes, numbuf);
 
@@ -2134,6 +2149,9 @@ typedef struct zdb_cb {
 	zdb_blkstats_t	zcb_type[ZB_TOTAL + 1][ZDB_OT_TOTAL + 1];
 	uint64_t	zcb_dedup_asize;
 	uint64_t	zcb_dedup_blocks;
+	uint64_t	zcb_embedded_blocks[NUM_BP_EMBEDDED_TYPES];
+	uint64_t	zcb_embedded_histogram[NUM_BP_EMBEDDED_TYPES]
+	    [BPE_PAYLOAD_SIZE];
 	uint64_t	zcb_start;
 	uint64_t	zcb_lastprint;
 	uint64_t	zcb_totalasize;
@@ -2188,6 +2206,13 @@ zdb_count_block(zdb_cb_t *zcb, zilog_t *
 
 	}
 
+	if (BP_IS_EMBEDDED(bp)) {
+		zcb->zcb_embedded_blocks[BPE_GET_ETYPE(bp)]++;
+		zcb->zcb_embedded_histogram[BPE_GET_ETYPE(bp)]
+		    [BPE_GET_PSIZE(bp)]++;
+		return;
+	}
+
 	if (dump_opt['L'])
 		return;
 
@@ -2224,7 +2249,7 @@ zdb_blkptr_done(zio_t *zio)
 	blkptr_t *bp = zio->io_bp;
 	int ioerr = zio->io_error;
 	zdb_cb_t *zcb = zio->io_private;
-	zbookmark_t *zb = &zio->io_bookmark;
+	zbookmark_phys_t *zb = &zio->io_bookmark;
 
 	zio_data_buf_free(zio->io_data, zio->io_size);
 
@@ -2259,7 +2284,7 @@ zdb_blkptr_done(zio_t *zio)
 /* ARGSUSED */
 static int
 zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	zdb_cb_t *zcb = arg;
 	dmu_object_type_t type;
@@ -2287,7 +2312,8 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 
 	is_metadata = (BP_GET_LEVEL(bp) != 0 || DMU_OT_IS_METADATA(type));
 
-	if (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata)) {
+	if (!BP_IS_EMBEDDED(bp) &&
+	    (dump_opt['c'] > 1 || (dump_opt['c'] && is_metadata))) {
 		size_t size = BP_GET_PSIZE(bp);
 		void *data = zio_data_buf_alloc(size);
 		int flags = ZIO_FLAG_CANFAIL | ZIO_FLAG_SCRUB | ZIO_FLAG_RAW;
@@ -2479,7 +2505,7 @@ dump_block_stats(spa_t *spa)
 	zdb_blkstats_t *zb, *tzb;
 	uint64_t norm_alloc, norm_space, total_alloc, total_found;
 	int flags = TRAVERSE_PRE | TRAVERSE_PREFETCH_METADATA | TRAVERSE_HARD;
-	int leaks = 0;
+	boolean_t leaks = B_FALSE;
 
 	(void) printf("\nTraversing all blocks %s%s%s%s%s...\n\n",
 	    (dump_opt['c'] || !dump_opt['L']) ? "to verify " : "",
@@ -2567,7 +2593,7 @@ dump_block_stats(spa_t *spa)
 		    (u_longlong_t)total_alloc,
 		    (dump_opt['L']) ? "unreachable" : "leaked",
 		    (longlong_t)(total_alloc - total_found));
-		leaks = 1;
+		leaks = B_TRUE;
 	}
 
 	if (tzb->zb_count == 0)
@@ -2599,6 +2625,23 @@ dump_block_stats(spa_t *spa)
 	(void) printf("\tSPA allocated: %10llu     used: %5.2f%%\n",
 	    (u_longlong_t)norm_alloc, 100.0 * norm_alloc / norm_space);
 
+	for (bp_embedded_type_t i = 0; i < NUM_BP_EMBEDDED_TYPES; i++) {
+		if (zcb.zcb_embedded_blocks[i] == 0)
+			continue;
+		(void) printf("\n");
+		(void) printf("\tadditional, non-pointer bps of type %u: "
+		    "%10llu\n",
+		    i, (u_longlong_t)zcb.zcb_embedded_blocks[i]);
+
+		if (dump_opt['b'] >= 3) {
+			(void) printf("\t number of (compressed) bytes:  "
+			    "number of bps\n");
+			dump_histogram(zcb.zcb_embedded_histogram[i],
+			    sizeof (zcb.zcb_embedded_histogram[i]) /
+			    sizeof (zcb.zcb_embedded_histogram[i][0]), 0);
+		}
+	}
+
 	if (tzb->zb_ditto_samevdev != 0) {
 		(void) printf("\tDittoed blocks on same vdev: %llu\n",
 		    (longlong_t)tzb->zb_ditto_samevdev);
@@ -2705,20 +2748,20 @@ typedef struct zdb_ddt_entry {
 /* ARGSUSED */
 static int
 zdb_ddt_add_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
-    const zbookmark_t *zb, const dnode_phys_t *dnp, void *arg)
+    const zbookmark_phys_t *zb, const dnode_phys_t *dnp, void *arg)
 {
 	avl_tree_t *t = arg;
 	avl_index_t where;
 	zdb_ddt_entry_t *zdde, zdde_search;
 
-	if (BP_IS_HOLE(bp))
+	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) {
 		(void) printf("traversing objset %llu, %llu objects, "
 		    "%lu blocks so far\n",
 		    (u_longlong_t)zb->zb_objset,
-		    (u_longlong_t)bp->blk_fill,
+		    (u_longlong_t)BP_GET_FILL(bp),
 		    avl_numnodes(t));
 	}
 
@@ -3316,7 +3359,8 @@ main(int argc, char **argv)
 
 	dprintf_setup(&argc, argv);
 
-	while ((c = getopt(argc, argv, "bcdhilmM:suCDRSAFLXevp:t:U:P")) != -1) {
+	while ((c = getopt(argc, argv,
+	    "bcdhilmM:suCDRSAFLXx:evp:t:U:P")) != -1) {
 		switch (c) {
 		case 'b':
 		case 'c':
@@ -3369,6 +3413,9 @@ main(int argc, char **argv)
 			}
 			searchdirs[nsearch++] = optarg;
 			break;
+		case 'x':
+			vn_dumpdir = optarg;
+			break;
 		case 't':
 			max_txg = strtoull(optarg, NULL, 0);
 			if (max_txg < TXG_INITIAL) {

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 /*
@@ -122,7 +122,7 @@ zil_prt_rec_write(zilog_t *zilog, int tx
 {
 	char *data, *dlimit;
 	blkptr_t *bp = &lr->lr_blkptr;
-	zbookmark_t zb;
+	zbookmark_phys_t zb;
 	char buf[SPA_MAXBLOCKSIZE];
 	int verbose = MAX(dump_opt['d'], dump_opt['i']);
 	int error;

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Tue Jul  8 12:46:33 2014	(r268394)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 27, 2014
+.Dd June 30, 2014
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -179,11 +179,12 @@
 .Ar bookmark
 .Nm
 .Cm send
-.Op Fl DnPpRv
+.Op Fl DnPpRve
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
 .Cm send
+.Op Fl e
 .Op Fl i Ar snapshot Ns | Ns bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
@@ -2476,7 +2477,7 @@ feature.
 .It Xo
 .Nm
 .Cm send
-.Op Fl DnPpRv
+.Op Fl DnPpRve
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Xc
@@ -2548,6 +2549,29 @@ be used regardless of the dataset's
 property, but performance will be much better if the filesystem uses a
 dedup-capable checksum (eg.
 .Sy sha256 ) .
+.It Fl e
+Generate a more compact stream by using WRITE_EMBEDDED records for blocks
+which are stored more compactly on disk by the
+.Sy embedded_data
+pool
+feature.
+This flag has no effect if the
+.Sy embedded_data
+feature is
+disabled.
+The receiving system must have the
+.Sy embedded_data
+feature
+enabled.
+If the
+.Sy lz4_compress
+feature is active on the sending system,
+then the receiving system must have that feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy embedded_data
+feature.
 .It Fl p
 Include the dataset's properties in the stream. This flag is implicit when
 .Fl R
@@ -2572,6 +2596,7 @@ on future versions of
 .It Xo
 .Nm
 .Cm send
+.Op Fl e
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
@@ -2597,6 +2622,29 @@ specified as the last component of the n
 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.
+.It Fl e
+Generate a more compact stream by using WRITE_EMBEDDED records for blocks
+which are stored more compactly on disk by the
+.Sy embedded_data
+pool
+feature.
+This flag has no effect if the
+.Sy embedded_data
+feature is
+disabled.
+The receiving system must have the
+.Sy embedded_data
+feature
+enabled.
+If the
+.Sy lz4_compress
+feature is active on the sending system,
+then the receiving system must have that feature enabled as well.
+See
+.Xr zpool-features 7
+for details on ZFS feature flags and the
+.Sy embedded_data
+feature.
 .El
 .It Xo
 .Nm

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -274,9 +274,9 @@ get_usage(zfs_help_t idx)
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] "
+		return (gettext("\tsend [-DnPpRve] [-[iI] snapshot] "
 		    "<snapshot>\n"
-		    "\tsend [-i snapshot|bookmark] "
+		    "\tsend [-e] [-i snapshot|bookmark] "
 		    "<filesystem|volume|snapshot>\n"));
 	case HELP_SET:
 		return (gettext("\tset <property=value> "
@@ -590,6 +590,7 @@ finish_progress(char *done)
 	free(pt_header);
 	pt_header = NULL;
 }
+
 /*
  * zfs clone [-p] [-o prop=value] ... <snap> <fs | vol>
  *
@@ -3368,6 +3369,7 @@ rollback_check_dependent(zfs_handle_t *z
 	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
@@ -3707,7 +3709,7 @@ zfs_do_send(int argc, char **argv)
 	boolean_t extraverbose = B_FALSE;
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":i:I:RDpvnP")) != -1) {
+	while ((c = getopt(argc, argv, ":i:I:RDpvnPe")) != -1) {
 		switch (c) {
 		case 'i':
 			if (fromname)
@@ -3742,6 +3744,9 @@ zfs_do_send(int argc, char **argv)
 		case 'n':
 			flags.dryrun = B_TRUE;
 			break;
+		case 'e':
+			flags.embed_data = B_TRUE;
+			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
 			    "'%c' option\n"), optopt);
@@ -3780,6 +3785,7 @@ zfs_do_send(int argc, char **argv)
 	if (strchr(argv[0], '@') == NULL ||
 	    (fromname && strchr(fromname, '#') != NULL)) {
 		char frombuf[ZFS_MAXNAMELEN];
+		enum lzc_send_flags lzc_flags = 0;
 
 		if (flags.replicate || flags.doall || flags.props ||
 		    flags.dedup || flags.dryrun || flags.verbose ||
@@ -3794,6 +3800,9 @@ zfs_do_send(int argc, char **argv)
 		if (zhp == NULL)
 			return (1);
 
+		if (flags.embed_data)
+			lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
+
 		if (fromname != NULL &&
 		    (fromname[0] == '#' || fromname[0] == '@')) {
 			/*
@@ -3807,7 +3816,7 @@ zfs_do_send(int argc, char **argv)
 			(void) strlcat(frombuf, fromname, sizeof (frombuf));
 			fromname = frombuf;
 		}
-		err = zfs_send_one(zhp, fromname, STDOUT_FILENO);
+		err = zfs_send_one(zhp, fromname, STDOUT_FILENO, lzc_flags);
 		zfs_close(zhp);
 		return (err != 0);
 	}

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7	Tue Jul  8 12:46:33 2014	(r268394)
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 23, 2014
+.Dd July 1, 2014
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -235,14 +235,11 @@ administrator can turn on
 compression on any dataset on the
 pool using the
 .Xr zfs 8
-command. Please note that doing so will
-immediately activate the
-.Sy lz4_compress
-feature on the underlying
-pool
-.Pq even before any data is written ,
-and the feature will not be
-deactivated.
+command.
+Also, all newly written metadata
+will be compressed with
+.Sy lz4
+algorithm.
 Since this feature is not read-only compatible, this
 operation will render the pool unimportable on systems without support
 for the
@@ -251,6 +248,12 @@ feature.
 Booting off of
 .Sy lz4
 -compressed root pools is supported.
+.Pp
+This feature becomes
+.Sy active
+as soon as it is enabled and will
+never return to being
+.Sy enabled .
 .It Sy multi_vdev_crash_dump
 .Bl -column "READ\-ONLY COMPATIBLE" "com.joyent:multi_vdev_crash_dump"
 .It GUID Ta com.joyent:multi_vdev_crash_dump
@@ -396,6 +399,34 @@ This feature becomes
 as soon as it is enabled and will
 never return to being
 .Sy enabled .
+.It Sy embedded_data
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:embedded_data"
+.It GUID Ta com.delphix:embedded_data
+.It READ\-ONLY COMPATIBLE Ta no
+.It DEPENDENCIES Ta none
+.El
+.Pp
+This feature improves the performance and compression ratio of
+highly-compressible blocks.
+Blocks whose contents can compress to 112 bytes
+or smaller can take advantage of this feature.
+.Pp
+When this feature is enabled, the contents of highly-compressible blocks are
+stored in the block "pointer" itself
+.Po a misnomer in this case, as it contains
+the compresseed data, rather than a pointer to its location on disk
+.Pc .
+Thus
+the space of the block
+.Pq one sector, typically 512 bytes or 4KB
+is saved,
+and no additional i/o is needed to read and write the data block.
+.Pp
+This feature becomes
+.Sy active
+as soon as it is enabled and will
+never return to being
+.Sy enabled .
 .El
 .Sh SEE ALSO
 .Xr zpool 8

Modified: user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
==============================================================================
--- user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Tue Jul  8 12:19:34 2014	(r268393)
+++ user/attilio/rm_vmobj_cache/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Tue Jul  8 12:46:33 2014	(r268394)
@@ -49,7 +49,6 @@
  */
 #define	DUMP_GROUPING	4
 
-uint64_t drr_record_count[DRR_NUMTYPES];
 uint64_t total_write_size = 0;
 uint64_t total_stream_len = 0;
 FILE *send_stream = 0;
@@ -123,7 +122,7 @@ print_block(char *buf, int length)
 	 * Start printing ASCII characters at a constant offset, after
 	 * the hex prints. Leave 3 characters per byte on a line (2 digit
 	 * hex number plus 1 space) plus spaces between characters and
-	 * groupings
+	 * groupings.
 	 */
 	int ascii_start = BYTES_PER_LINE * 3 +
 	    BYTES_PER_LINE / DUMP_GROUPING + 2;
@@ -160,6 +159,8 @@ int
 main(int argc, char *argv[])
 {
 	char *buf = malloc(INITIAL_BUFLEN);
+	uint64_t drr_record_count[DRR_NUMTYPES] = { 0 };
+	uint64_t total_records = 0;
 	dmu_replay_record_t thedrr;
 	dmu_replay_record_t *drr = &thedrr;
 	struct drr_begin *drrb = &thedrr.drr_u.drr_begin;
@@ -170,6 +171,7 @@ main(int argc, char *argv[])
 	struct drr_write_byref *drrwbr = &thedrr.drr_u.drr_write_byref;
 	struct drr_free *drrf = &thedrr.drr_u.drr_free;
 	struct drr_spill *drrs = &thedrr.drr_u.drr_spill;
+	struct drr_write_embedded *drrwe = &thedrr.drr_u.drr_write_embedded;
 	char c;
 	boolean_t verbose = B_FALSE;
 	boolean_t first = B_TRUE;
@@ -264,6 +266,7 @@ main(int argc, char *argv[])
 		}
 
 		drr_record_count[drr->drr_type]++;
+		total_records++;
 
 		switch (drr->drr_type) {
 		case DRR_BEGIN:
@@ -376,8 +379,8 @@ main(int argc, char *argv[])
 				    drro->drr_bonuslen);
 			}
 			if (drro->drr_bonuslen > 0) {
-				(void) ssread(buf, P2ROUNDUP(drro->drr_bonuslen,
-				    8), &zc);
+				(void) ssread(buf,
+				    P2ROUNDUP(drro->drr_bonuslen, 8), &zc);
 				if (dump) {
 					print_block(buf,
 					    P2ROUNDUP(drro->drr_bonuslen, 8));
@@ -506,6 +509,38 @@ main(int argc, char *argv[])
 				print_block(buf, drrs->drr_length);
 			}
 			break;
+		case DRR_WRITE_EMBEDDED:
+			if (do_byteswap) {
+				drrwe->drr_object =
+				    BSWAP_64(drrwe->drr_object);
+				drrwe->drr_offset =
+				    BSWAP_64(drrwe->drr_offset);
+				drrwe->drr_length =
+				    BSWAP_64(drrwe->drr_length);
+				drrwe->drr_toguid =
+				    BSWAP_64(drrwe->drr_toguid);
+				drrwe->drr_lsize =
+				    BSWAP_32(drrwe->drr_lsize);
+				drrwe->drr_psize =
+				    BSWAP_32(drrwe->drr_psize);
+			}
+			if (verbose) {
+				(void) printf("WRITE_EMBEDDED object = %llu "
+				    "offset = %llu length = %llu\n"
+				    "toguid = %llx comp = %u etype = %u "
+				    "lsize = %u psize = %u\n",
+				    (u_longlong_t)drrwe->drr_object,
+				    (u_longlong_t)drrwe->drr_offset,
+				    (u_longlong_t)drrwe->drr_length,
+				    (u_longlong_t)drrwe->drr_toguid,
+				    drrwe->drr_compression,
+				    drrwe->drr_etype,
+				    drrwe->drr_lsize,
+				    drrwe->drr_psize);
+			}
+			(void) ssread(buf,
+			    P2ROUNDUP(drrwe->drr_psize, 8), &zc);
+			break;
 		}
 		pcksum = zc;
 	}

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