svn commit: r286685 - in projects/clang-trunk: . cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zstreamdump cddl/contrib/opensolaris/lib/libzfs/commo...

Dimitry Andric dim at FreeBSD.org
Wed Aug 12 18:39:55 UTC 2015 

Author: dim
Date: Wed Aug 12 18:39:49 2015
New Revision: 286685
URL: https://svnweb.freebsd.org/changeset/base/286685

Log:
  Merge ^/head r286422 through r286684.

Added:
  projects/clang-trunk/share/man/man4/iwm.4
     - copied unchanged from r286684, head/share/man/man4/iwm.4
  projects/clang-trunk/share/man/man4/iwmfw.4
     - copied unchanged from r286684, head/share/man/man4/iwmfw.4
  projects/clang-trunk/sys/arm64/cavium/
     - copied from r286684, head/sys/arm64/cavium/
  projects/clang-trunk/sys/contrib/dev/iwm/
     - copied from r286684, head/sys/contrib/dev/iwm/
  projects/clang-trunk/sys/dev/iwm/
     - copied from r286684, head/sys/dev/iwm/
  projects/clang-trunk/sys/modules/iwm/
     - copied from r286684, head/sys/modules/iwm/
  projects/clang-trunk/sys/modules/iwmfw/
     - copied from r286684, head/sys/modules/iwmfw/
  projects/clang-trunk/sys/x86/x86/bus_machdep.c
     - copied unchanged from r286684, head/sys/x86/x86/bus_machdep.c
  projects/clang-trunk/usr.bin/xargs/tests/regress.0P1.out
     - copied unchanged from r286684, head/usr.bin/xargs/tests/regress.0P1.out
  projects/clang-trunk/usr.bin/xargs/tests/regress.P1.out
     - copied unchanged from r286684, head/usr.bin/xargs/tests/regress.P1.out
  projects/clang-trunk/usr.bin/xargs/tests/regress.n2P0.out
     - copied unchanged from r286684, head/usr.bin/xargs/tests/regress.n2P0.out
Modified:
  projects/clang-trunk/Makefile.inc1
  projects/clang-trunk/UPDATING
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/clang-trunk/contrib/apr/CHANGES
  projects/clang-trunk/contrib/apr/CMakeLists.txt
  projects/clang-trunk/contrib/apr/Makefile.in
  projects/clang-trunk/contrib/apr/NOTICE
  projects/clang-trunk/contrib/apr/NWGNUmakefile
  projects/clang-trunk/contrib/apr/apr.dsp
  projects/clang-trunk/contrib/apr/apr.spec
  projects/clang-trunk/contrib/apr/build-outputs.mk
  projects/clang-trunk/contrib/apr/configure
  projects/clang-trunk/contrib/apr/configure.in
  projects/clang-trunk/contrib/apr/encoding/apr_escape.c
  projects/clang-trunk/contrib/apr/include/apr_skiplist.h
  projects/clang-trunk/contrib/apr/include/apr_version.h
  projects/clang-trunk/contrib/apr/libapr.dsp
  projects/clang-trunk/contrib/apr/locks/unix/proc_mutex.c
  projects/clang-trunk/contrib/apr/memory/unix/apr_pools.c
  projects/clang-trunk/contrib/apr/misc/unix/errorcodes.c
  projects/clang-trunk/contrib/apr/network_io/unix/sockaddr.c
  projects/clang-trunk/contrib/apr/network_io/unix/sockets.c
  projects/clang-trunk/contrib/apr/poll/unix/epoll.c
  projects/clang-trunk/contrib/apr/poll/unix/kqueue.c
  projects/clang-trunk/contrib/apr/poll/unix/poll.c
  projects/clang-trunk/contrib/apr/poll/unix/pollcb.c
  projects/clang-trunk/contrib/apr/poll/unix/port.c
  projects/clang-trunk/contrib/apr/poll/unix/z_asio.c
  projects/clang-trunk/contrib/apr/tables/apr_skiplist.c
  projects/clang-trunk/contrib/binutils/gas/config/tc-i386.c
  projects/clang-trunk/contrib/netbsd-tests/lib/libc/locale/t_mbrtowc.c
  projects/clang-trunk/contrib/netbsd-tests/lib/libc/locale/t_mbstowcs.c
  projects/clang-trunk/contrib/serf/CHANGES
  projects/clang-trunk/contrib/serf/auth/auth_spnego_sspi.c
  projects/clang-trunk/contrib/serf/buckets/deflate_buckets.c
  projects/clang-trunk/contrib/serf/buckets/ssl_buckets.c
  projects/clang-trunk/contrib/serf/serf.h
  projects/clang-trunk/contrib/sqlite3/Makefile.am
  projects/clang-trunk/contrib/sqlite3/Makefile.in
  projects/clang-trunk/contrib/sqlite3/configure
  projects/clang-trunk/contrib/sqlite3/configure.ac
  projects/clang-trunk/contrib/sqlite3/shell.c
  projects/clang-trunk/contrib/sqlite3/sqlite3.c
  projects/clang-trunk/contrib/sqlite3/sqlite3.h
  projects/clang-trunk/contrib/sqlite3/sqlite3ext.h
  projects/clang-trunk/contrib/subversion/CHANGES
  projects/clang-trunk/contrib/subversion/Makefile.in
  projects/clang-trunk/contrib/subversion/NOTICE
  projects/clang-trunk/contrib/subversion/autogen.sh
  projects/clang-trunk/contrib/subversion/build-outputs.mk
  projects/clang-trunk/contrib/subversion/build.conf
  projects/clang-trunk/contrib/subversion/configure
  projects/clang-trunk/contrib/subversion/configure.ac
  projects/clang-trunk/contrib/subversion/get-deps.sh
  projects/clang-trunk/contrib/subversion/subversion/include/private/svn_diff_private.h
  projects/clang-trunk/contrib/subversion/subversion/include/private/svn_mergeinfo_private.h
  projects/clang-trunk/contrib/subversion/subversion/include/private/svn_repos_private.h
  projects/clang-trunk/contrib/subversion/subversion/include/private/svn_sqlite.h
  projects/clang-trunk/contrib/subversion/subversion/include/svn_io.h
  projects/clang-trunk/contrib/subversion/subversion/include/svn_version.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/copy.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/externals.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/log.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/merge.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/patch.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_client/upgrade.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_delta/svndiff.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_diff/parse-diff.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_diff/util.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_fs_fs/caching.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_ra_serf/options.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_repos/commit.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_repos/load-fs-vtable.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_repos/rev_hunt.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/cache-membuffer.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/config.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/dso.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/error.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/io.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/mergeinfo.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/sqlite3wrapper.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/string.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_subr/version.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/adm_ops.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/cleanup.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/conflicts.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/copy.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/diff.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/diff_editor.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/diff_local.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/entries.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/externals.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/update_editor.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc-metadata.sql
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc_db.c
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc_db.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
  projects/clang-trunk/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  projects/clang-trunk/contrib/subversion/subversion/svn/conflict-callbacks.c
  projects/clang-trunk/contrib/subversion/subversion/svn/list-cmd.c
  projects/clang-trunk/contrib/subversion/subversion/svn/svn.c
  projects/clang-trunk/contrib/subversion/subversion/svn_private_config.h.in
  projects/clang-trunk/contrib/subversion/subversion/svnadmin/svnadmin.c
  projects/clang-trunk/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
  projects/clang-trunk/contrib/subversion/subversion/svnrdump/load_editor.c
  projects/clang-trunk/contrib/subversion/subversion/svnserve/serve.c
  projects/clang-trunk/contrib/subversion/subversion/svnsync/sync.c
  projects/clang-trunk/contrib/subversion/win-tests.py
  projects/clang-trunk/etc/group
  projects/clang-trunk/etc/mtree/BSD.usr.dist
  projects/clang-trunk/etc/network.subr
  projects/clang-trunk/etc/portsnap.conf
  projects/clang-trunk/etc/rc.d/hostname
  projects/clang-trunk/etc/rc.d/netif
  projects/clang-trunk/lib/libc/locale/utf8.c
  projects/clang-trunk/lib/libc/string/bcopy.3
  projects/clang-trunk/lib/libsqlite3/Makefile
  projects/clang-trunk/lib/libthr/thread/thr_rtld.c
  projects/clang-trunk/lib/libthr/thread/thr_sig.c
  projects/clang-trunk/lib/msun/src/s_exp2.c
  projects/clang-trunk/release/doc/en_US.ISO8859-1/hardware/article.xml
  projects/clang-trunk/sbin/camcontrol/camcontrol.8
  projects/clang-trunk/sbin/geom/class/eli/geli.8
  projects/clang-trunk/sbin/geom/class/eli/geom_eli.c
  projects/clang-trunk/sbin/ipfw/tables.c
  projects/clang-trunk/sbin/reboot/nextboot.8
  projects/clang-trunk/sbin/swapon/swapon.c
  projects/clang-trunk/share/man/man4/Makefile
  projects/clang-trunk/share/man/man4/cloudabi.4
  projects/clang-trunk/share/man/man4/ctl.4
  projects/clang-trunk/share/man/man4/em.4
  projects/clang-trunk/share/man/man4/gre.4
  projects/clang-trunk/share/man/man4/hptiop.4
  projects/clang-trunk/share/man/man4/man4.i386/wl.4
  projects/clang-trunk/share/man/man4/ng_btsocket.4
  projects/clang-trunk/share/man/man4/proto.4
  projects/clang-trunk/share/man/man4/siftr.4
  projects/clang-trunk/share/man/man4/snp.4
  projects/clang-trunk/share/man/man4/uart.4
  projects/clang-trunk/share/man/man4/uftdi.4
  projects/clang-trunk/share/man/man4/vt.4
  projects/clang-trunk/share/man/man4/wlan.4
  projects/clang-trunk/share/man/man5/fstab.5
  projects/clang-trunk/share/man/man7/release.7
  projects/clang-trunk/share/man/man8/nanobsd.8
  projects/clang-trunk/share/man/man8/uefi.8
  projects/clang-trunk/share/man/man8/yp.8
  projects/clang-trunk/share/man/man9/PCI_IOV_ADD_VF.9
  projects/clang-trunk/share/man/man9/PCI_IOV_INIT.9
  projects/clang-trunk/share/man/man9/altq.9
  projects/clang-trunk/share/man/man9/atomic.9
  projects/clang-trunk/share/man/man9/ifnet.9
  projects/clang-trunk/share/man/man9/nv.9
  projects/clang-trunk/share/misc/committers-src.dot
  projects/clang-trunk/sys/amd64/amd64/genassym.c
  projects/clang-trunk/sys/amd64/amd64/machdep.c
  projects/clang-trunk/sys/amd64/amd64/mp_machdep.c
  projects/clang-trunk/sys/amd64/amd64/pmap.c
  projects/clang-trunk/sys/arm/arm/machdep.c
  projects/clang-trunk/sys/arm/at91/at91_machdep.c
  projects/clang-trunk/sys/arm/cavium/cns11xx/econa_machdep.c
  projects/clang-trunk/sys/arm/include/param.h
  projects/clang-trunk/sys/arm/samsung/s3c2xx0/s3c24x0_machdep.c
  projects/clang-trunk/sys/arm/ti/am335x/am335x_dmtimer.c
  projects/clang-trunk/sys/arm/ti/ti_hwmods.c
  projects/clang-trunk/sys/arm/ti/ti_hwmods.h
  projects/clang-trunk/sys/arm/xscale/i80321/ep80219_machdep.c
  projects/clang-trunk/sys/arm/xscale/i80321/iq31244_machdep.c
  projects/clang-trunk/sys/arm/xscale/i8134x/crb_machdep.c
  projects/clang-trunk/sys/arm/xscale/ixp425/avila_machdep.c
  projects/clang-trunk/sys/arm/xscale/pxa/pxa_machdep.c
  projects/clang-trunk/sys/arm64/arm64/db_interface.c
  projects/clang-trunk/sys/arm64/arm64/locore.S
  projects/clang-trunk/sys/arm64/arm64/trap.c
  projects/clang-trunk/sys/arm64/conf/GENERIC
  projects/clang-trunk/sys/arm64/include/armreg.h
  projects/clang-trunk/sys/cam/ata/ata_da.c
  projects/clang-trunk/sys/cam/ctl/ctl.c
  projects/clang-trunk/sys/cddl/compat/opensolaris/sys/kstat.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bpobj.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_sa.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zrlock.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_fd.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_file.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_proc.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_sock.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_poll.c
  projects/clang-trunk/sys/compat/cloudabi64/cloudabi64_sock.c
  projects/clang-trunk/sys/conf/WITHOUT_SOURCELESS_UCODE
  projects/clang-trunk/sys/conf/files
  projects/clang-trunk/sys/conf/files.amd64
  projects/clang-trunk/sys/conf/files.arm64
  projects/clang-trunk/sys/conf/files.i386
  projects/clang-trunk/sys/conf/options
  projects/clang-trunk/sys/contrib/libnv/nv_impl.h
  projects/clang-trunk/sys/contrib/libnv/nvlist.c
  projects/clang-trunk/sys/ddb/db_ps.c
  projects/clang-trunk/sys/dev/ata/ata-all.c
  projects/clang-trunk/sys/dev/ata/chipsets/ata-intel.c
  projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.c
  projects/clang-trunk/sys/dev/ath/ath_rate/sample/sample.h
  projects/clang-trunk/sys/dev/ath/if_ath.c
  projects/clang-trunk/sys/dev/ath/if_ath_beacon.c
  projects/clang-trunk/sys/dev/ath/if_ath_debug.h
  projects/clang-trunk/sys/dev/ath/if_ath_keycache.c
  projects/clang-trunk/sys/dev/ath/if_ath_misc.h
  projects/clang-trunk/sys/dev/ath/if_ath_rx.c
  projects/clang-trunk/sys/dev/ath/if_ath_rx_edma.c
  projects/clang-trunk/sys/dev/ath/if_ath_sysctl.c
  projects/clang-trunk/sys/dev/ath/if_ath_tdma.c
  projects/clang-trunk/sys/dev/ath/if_ath_tx.c
  projects/clang-trunk/sys/dev/ath/if_ath_tx_edma.c
  projects/clang-trunk/sys/dev/ath/if_athvar.h
  projects/clang-trunk/sys/dev/bwi/bwimac.c
  projects/clang-trunk/sys/dev/bwi/bwiphy.c
  projects/clang-trunk/sys/dev/bwi/bwirf.c
  projects/clang-trunk/sys/dev/bwi/if_bwi.c
  projects/clang-trunk/sys/dev/bwi/if_bwivar.h
  projects/clang-trunk/sys/dev/bwn/if_bwn.c
  projects/clang-trunk/sys/dev/bwn/if_bwnvar.h
  projects/clang-trunk/sys/dev/drm/drmP.h
  projects/clang-trunk/sys/dev/drm2/drmP.h
  projects/clang-trunk/sys/dev/if_ndis/if_ndis.c
  projects/clang-trunk/sys/dev/if_ndis/if_ndisvar.h
  projects/clang-trunk/sys/dev/ipw/if_ipw.c
  projects/clang-trunk/sys/dev/ipw/if_ipwvar.h
  projects/clang-trunk/sys/dev/iwi/if_iwi.c
  projects/clang-trunk/sys/dev/iwi/if_iwivar.h
  projects/clang-trunk/sys/dev/iwn/if_iwn.c
  projects/clang-trunk/sys/dev/iwn/if_iwnvar.h
  projects/clang-trunk/sys/dev/malo/if_malo.c
  projects/clang-trunk/sys/dev/malo/if_malo.h
  projects/clang-trunk/sys/dev/mps/mps.c
  projects/clang-trunk/sys/dev/mps/mps_config.c
  projects/clang-trunk/sys/dev/mps/mpsvar.h
  projects/clang-trunk/sys/dev/mwl/if_mwl.c
  projects/clang-trunk/sys/dev/mwl/if_mwl_pci.c
  projects/clang-trunk/sys/dev/mwl/if_mwlvar.h
  projects/clang-trunk/sys/dev/pci/pci_pci.c
  projects/clang-trunk/sys/dev/psci/psci.c
  projects/clang-trunk/sys/dev/ral/if_ral_pci.c
  projects/clang-trunk/sys/dev/ral/rt2560.c
  projects/clang-trunk/sys/dev/ral/rt2560var.h
  projects/clang-trunk/sys/dev/ral/rt2661.c
  projects/clang-trunk/sys/dev/ral/rt2661var.h
  projects/clang-trunk/sys/dev/ral/rt2860.c
  projects/clang-trunk/sys/dev/ral/rt2860var.h
  projects/clang-trunk/sys/dev/uart/uart_bus.h
  projects/clang-trunk/sys/dev/uart/uart_bus_pci.c
  projects/clang-trunk/sys/dev/uart/uart_core.c
  projects/clang-trunk/sys/dev/uart/uart_tty.c
  projects/clang-trunk/sys/dev/usb/wlan/if_rsu.c
  projects/clang-trunk/sys/dev/usb/wlan/if_rsureg.h
  projects/clang-trunk/sys/dev/usb/wlan/if_rum.c
  projects/clang-trunk/sys/dev/usb/wlan/if_rumvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_run.c
  projects/clang-trunk/sys/dev/usb/wlan/if_runvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_uath.c
  projects/clang-trunk/sys/dev/usb/wlan/if_uathvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_upgt.c
  projects/clang-trunk/sys/dev/usb/wlan/if_upgtvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_ural.c
  projects/clang-trunk/sys/dev/usb/wlan/if_uralvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_urtw.c
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwn.c
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwnreg.h
  projects/clang-trunk/sys/dev/usb/wlan/if_urtwvar.h
  projects/clang-trunk/sys/dev/usb/wlan/if_zyd.c
  projects/clang-trunk/sys/dev/usb/wlan/if_zydreg.h
  projects/clang-trunk/sys/dev/vt/hw/efifb/efifb.c
  projects/clang-trunk/sys/dev/vt/hw/vga/vt_vga.c
  projects/clang-trunk/sys/dev/wi/if_wi.c
  projects/clang-trunk/sys/dev/wi/if_wi_pccard.c
  projects/clang-trunk/sys/dev/wi/if_wi_pci.c
  projects/clang-trunk/sys/dev/wi/if_wivar.h
  projects/clang-trunk/sys/dev/wpi/if_wpi.c
  projects/clang-trunk/sys/dev/wpi/if_wpivar.h
  projects/clang-trunk/sys/dev/wtap/if_wtap.c
  projects/clang-trunk/sys/dev/wtap/if_wtapvar.h
  projects/clang-trunk/sys/geom/eli/g_eli.c
  projects/clang-trunk/sys/geom/eli/g_eli.h
  projects/clang-trunk/sys/geom/eli/g_eli_ctl.c
  projects/clang-trunk/sys/geom/raid/md_intel.c
  projects/clang-trunk/sys/geom/raid/md_jmicron.c
  projects/clang-trunk/sys/geom/raid/md_nvidia.c
  projects/clang-trunk/sys/geom/raid/md_sii.c
  projects/clang-trunk/sys/geom/uncompress/g_uncompress.c
  projects/clang-trunk/sys/i386/i386/genassym.c
  projects/clang-trunk/sys/i386/i386/machdep.c
  projects/clang-trunk/sys/i386/i386/mp_machdep.c
  projects/clang-trunk/sys/i386/i386/pmap.c
  projects/clang-trunk/sys/i386/i386/sys_machdep.c
  projects/clang-trunk/sys/kern/kern_event.c
  projects/clang-trunk/sys/kern/kern_fork.c
  projects/clang-trunk/sys/kern/kern_sig.c
  projects/clang-trunk/sys/kern/kern_tc.c
  projects/clang-trunk/sys/kern/subr_param.c
  projects/clang-trunk/sys/kern/sys_capability.c
  projects/clang-trunk/sys/kern/uipc_mbuf.c
  projects/clang-trunk/sys/kern/uipc_mbuf2.c
  projects/clang-trunk/sys/kern/vfs_lookup.c
  projects/clang-trunk/sys/modules/Makefile
  projects/clang-trunk/sys/net/if.c
  projects/clang-trunk/sys/net/if_llatbl.c
  projects/clang-trunk/sys/net/if_llatbl.h
  projects/clang-trunk/sys/net/route.c
  projects/clang-trunk/sys/net/route.h
  projects/clang-trunk/sys/net80211/ieee80211.c
  projects/clang-trunk/sys/net80211/ieee80211_ddb.c
  projects/clang-trunk/sys/net80211/ieee80211_freebsd.c
  projects/clang-trunk/sys/net80211/ieee80211_ioctl.c
  projects/clang-trunk/sys/net80211/ieee80211_output.c
  projects/clang-trunk/sys/net80211/ieee80211_power.c
  projects/clang-trunk/sys/net80211/ieee80211_proto.c
  projects/clang-trunk/sys/net80211/ieee80211_proto.h
  projects/clang-trunk/sys/net80211/ieee80211_regdomain.c
  projects/clang-trunk/sys/net80211/ieee80211_scan_sta.c
  projects/clang-trunk/sys/net80211/ieee80211_var.h
  projects/clang-trunk/sys/netinet/if_ether.c
  projects/clang-trunk/sys/netinet/in.c
  projects/clang-trunk/sys/netinet/in_pcb.c
  projects/clang-trunk/sys/netinet/in_pcb.h
  projects/clang-trunk/sys/netinet/in_rmx.c
  projects/clang-trunk/sys/netinet/ip_output.c
  projects/clang-trunk/sys/netinet/tcp_reass.c
  projects/clang-trunk/sys/netinet/tcp_subr.c
  projects/clang-trunk/sys/netinet/tcp_timer.h
  projects/clang-trunk/sys/netinet/tcp_usrreq.c
  projects/clang-trunk/sys/netinet/toecore.c
  projects/clang-trunk/sys/netinet6/in6.c
  projects/clang-trunk/sys/netinet6/in6_rmx.c
  projects/clang-trunk/sys/netinet6/ip6_mroute.c
  projects/clang-trunk/sys/netinet6/ip6_output.c
  projects/clang-trunk/sys/netinet6/ip6_var.h
  projects/clang-trunk/sys/netinet6/nd6.c
  projects/clang-trunk/sys/netinet6/nd6.h
  projects/clang-trunk/sys/netinet6/nd6_nbr.c
  projects/clang-trunk/sys/netinet6/nd6_rtr.c
  projects/clang-trunk/sys/netpfil/pf/pf_ioctl.c
  projects/clang-trunk/sys/powerpc/aim/mmu_oea.c
  projects/clang-trunk/sys/powerpc/aim/mmu_oea64.c
  projects/clang-trunk/sys/powerpc/booke/booke_machdep.c
  projects/clang-trunk/sys/powerpc/booke/pmap.c
  projects/clang-trunk/sys/powerpc/include/param.h
  projects/clang-trunk/sys/sys/ata.h
  projects/clang-trunk/sys/sys/cdefs.h
  projects/clang-trunk/sys/sys/conf.h
  projects/clang-trunk/sys/sys/mbuf.h
  projects/clang-trunk/sys/sys/param.h
  projects/clang-trunk/sys/sys/syscallsubr.h
  projects/clang-trunk/sys/vm/uma_core.c
  projects/clang-trunk/sys/vm/vm_glue.c
  projects/clang-trunk/sys/x86/include/bus.h
  projects/clang-trunk/sys/x86/x86/local_apic.c
  projects/clang-trunk/sys/x86/xen/pv.c
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/tools/tools/iwn/iwnstats/main.c
  projects/clang-trunk/usr.bin/Makefile
  projects/clang-trunk/usr.bin/mkimg/mkimg.1
  projects/clang-trunk/usr.bin/patch/inp.c
  projects/clang-trunk/usr.bin/svn/lib/libapr/apr.h
  projects/clang-trunk/usr.bin/svn/lib/libapr/apr_private.h
  projects/clang-trunk/usr.bin/svn/lib/libapr_util/apu.h
  projects/clang-trunk/usr.bin/svn/lib/libapr_util/apu_config.h
  projects/clang-trunk/usr.bin/svn/svn_private_config.h
  projects/clang-trunk/usr.bin/svn/svnversion/Makefile
  projects/clang-trunk/usr.bin/units/units.c
  projects/clang-trunk/usr.bin/wc/wc.1
  projects/clang-trunk/usr.bin/xargs/tests/Makefile
  projects/clang-trunk/usr.bin/xargs/tests/regress.sh
  projects/clang-trunk/usr.bin/xargs/xargs.c
  projects/clang-trunk/usr.bin/xlint/lint1/decl.c
  projects/clang-trunk/usr.bin/xlint/lint1/func.c
  projects/clang-trunk/usr.bin/xlint/lint1/init.c
  projects/clang-trunk/usr.bin/xlint/lint1/lint.h
  projects/clang-trunk/usr.bin/xlint/lint1/lint1.h
  projects/clang-trunk/usr.bin/xlint/lint1/scan.l
  projects/clang-trunk/usr.bin/xlint/lint1/tree.c
  projects/clang-trunk/usr.bin/xlint/lint2/read.c
  projects/clang-trunk/usr.bin/ypmatch/ypmatch.c
  projects/clang-trunk/usr.sbin/bhyve/bhyve.8
  projects/clang-trunk/usr.sbin/ctld/login.c
  projects/clang-trunk/usr.sbin/fstyp/geli.c
  projects/clang-trunk/usr.sbin/pwd_mkdb/pwd_mkdb.8
  projects/clang-trunk/usr.sbin/rtsold/probe.c
  projects/clang-trunk/usr.sbin/sysrc/sysrc.8
  projects/clang-trunk/usr.sbin/wake/wake.8
  projects/clang-trunk/usr.sbin/ypset/ypset.8
  projects/clang-trunk/usr.sbin/ypset/ypset.c
Directory Properties:
  projects/clang-trunk/   (props changed)
  projects/clang-trunk/cddl/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang-trunk/contrib/apr/   (props changed)
  projects/clang-trunk/contrib/binutils/   (props changed)
  projects/clang-trunk/contrib/serf/   (props changed)
  projects/clang-trunk/contrib/sqlite3/   (props changed)
  projects/clang-trunk/contrib/subversion/   (props changed)
  projects/clang-trunk/etc/   (props changed)
  projects/clang-trunk/lib/libc/   (props changed)
  projects/clang-trunk/sbin/   (props changed)
  projects/clang-trunk/sbin/ipfw/   (props changed)
  projects/clang-trunk/share/   (props changed)
  projects/clang-trunk/share/man/man4/   (props changed)
  projects/clang-trunk/sys/   (props changed)
  projects/clang-trunk/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/sys/conf/   (props changed)
  projects/clang-trunk/usr.bin/mkimg/   (props changed)
  projects/clang-trunk/usr.sbin/bhyve/   (props changed)
  projects/clang-trunk/usr.sbin/rtsold/   (props changed)

Modified: projects/clang-trunk/Makefile.inc1
==============================================================================
--- projects/clang-trunk/Makefile.inc1	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/Makefile.inc1	Wed Aug 12 18:39:49 2015	(r286685)
@@ -807,7 +807,7 @@ __installcheck_UGID:
 _zoneinfo=	zic tzsetup
 .endif
 
-ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
+ITOOLS=	[ awk cap_mkdb cat chflags chmod chown cmp cp \
 	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb \
 	rm sed services_mkdb sh strip sysctl test true uname wc ${_zoneinfo} \
@@ -1225,16 +1225,23 @@ update:
 #
 
 #
-# legacy: Build compatibility shims for the next three targets. This is a minimal
-# set of tools and shims necessary to compensate for older systems which don't have
-# the APIs that the targets built in bootstrap-tools, build-tools or cross-tools.
+# legacy: Build compatibility shims for the next three targets. This is a
+# minimal set of tools and shims necessary to compensate for older systems
+# which don't have the APIs required by the targets built in bootstrap-tools,
+# build-tools or cross-tools.
 #
+
+# ELF Tool Chain libraries are needed for ELF tools and dtrace tools.
+.if ${BOOTSTRAPPING} < 1100006
+_elftoolchain_libs= lib/libelf lib/libdwarf 
+.endif
+
 legacy:
 .if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
 	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
 	false
 .endif
-.for _tool in tools/build
+.for _tool in tools/build ${_elftoolchain_libs}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool} && \
 	    ${MAKE} DIRPRFX=${_tool}/ obj && \
@@ -1297,7 +1304,8 @@ _lex=		usr.bin/lex
 
 # r277259 crunchide: Correct 64-bit section header offset
 # r281674 crunchide: always include both 32- and 64-bit ELF support
-.if ${BOOTSTRAPPING} < 1100071
+# r285986 crunchen: use STRIPBIN rather than STRIP
+.if ${BOOTSTRAPPING} < 1100078
 _crunch=	usr.sbin/crunch
 .endif
 
@@ -1332,13 +1340,12 @@ ${_bt}-usr.bin/clang/tblgen: ${_bt}-lib/
 # pre libdwarf
 .if ${BOOTSTRAPPING} < 1100006 || (${MACHINE} != ${TARGET} || \
     ${MACHINE_ARCH} != ${TARGET_ARCH})
-_elftoolchain_libs= lib/libelf lib/libdwarf 
 .if ${MK_CDDL} != "no"
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf cddl/usr.bin/ctfconvert \
     cddl/usr.bin/ctfmerge
 
-${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-lib/libelf ${_bt}-lib/libdwarf ${_bt}-cddl/lib/libctf
-${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-lib/libelf ${_bt}-lib/libdwarf ${_bt}-cddl/lib/libctf
+${_bt}-cddl/usr.bin/ctfconvert: ${_bt}-cddl/lib/libctf
+${_bt}-cddl/usr.bin/ctfmerge: ${_bt}-cddl/lib/libctf
 .endif
 .endif
 
@@ -1381,7 +1388,6 @@ bootstrap-tools: .PHONY
 .for _tool in \
     ${_clang_tblgen} \
     ${_kerberos5_bootstrap_tools} \
-    ${_elftoolchain_libs} \
     ${_dtrace_tools} \
     ${_strfile} \
     ${_gperf} \
@@ -1426,15 +1432,10 @@ _share=	share/syscons/scrnmaps
 _gcc_tools= gnu/usr.bin/cc/cc_tools
 .endif
 
-.if ${MK_RESCUE} != "no"
-_rescue= rescue/rescue
-.endif
-
 build-tools: .MAKE
 .for _tool in \
     bin/csh \
     bin/sh \
-    ${_rescue} \
     ${LOCAL_TOOL_DIRS} \
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \

Modified: projects/clang-trunk/UPDATING
==============================================================================
--- projects/clang-trunk/UPDATING	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/UPDATING	Wed Aug 12 18:39:49 2015	(r286685)
@@ -36,6 +36,28 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11
 	20141231 entry below for information about prerequisites and upgrading,
 	if you are not already using 3.5.0 or higher.
 
+20150810:
+	The polarity of Pulse Per Second (PPS) capture events with the
+	uart(4) driver has been corrected.  Prior to this change the PPS
+	"assert" event corresponded to the trailing edge of a positive PPS
+	pulse and the "clear" event was the leading edge of the next pulse.
+
+	As the width of a PPS pulse in a typical GPS receiver is on the
+	order of 1 millisecond, most users will not notice any significant
+	difference with this change.
+
+	Anyone who has compensated for the historical polarity reversal by
+	configuring a negative offset equal to the pulse width will need to
+	remove that workaround.
+
+20150809:
+	The default group assigned to /dev/dri entries has been changed
+	from 'wheel' to 'video' with the id of '44'. If you want to have
+	access to the dri devices please add yourself to the video group
+	with:
+
+	# pw groupmod video -m $USER
+
 20150806:
 	The menu.rc and loader.rc files will now be replaced during 
 	upgrades. Please migrate local changes to menu.rc.local and

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Wed Aug 12 18:39:49 2015	(r286685)
@@ -95,6 +95,8 @@ static int zopt_objects = 0;
 static libzfs_handle_t *g_zfs;
 static uint64_t max_inflight = 1000;
 
+static void snprintf_blkptr_compact(char *, size_t, const blkptr_t *);
+
 /*
  * These libumem hooks provide a reasonable set of defaults for the allocator's
  * debugging facilities.
@@ -418,6 +420,79 @@ dump_zap(objset_t *os, uint64_t object, 
 	zap_cursor_fini(&zc);
 }
 
+static void
+dump_bpobj(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	bpobj_phys_t *bpop = data;
+	char bytes[32], comp[32], uncomp[32];
+
+	if (bpop == NULL)
+		return;
+
+	zdb_nicenum(bpop->bpo_bytes, bytes);
+	zdb_nicenum(bpop->bpo_comp, comp);
+	zdb_nicenum(bpop->bpo_uncomp, uncomp);
+
+	(void) printf("\t\tnum_blkptrs = %llu\n",
+	    (u_longlong_t)bpop->bpo_num_blkptrs);
+	(void) printf("\t\tbytes = %s\n", bytes);
+	if (size >= BPOBJ_SIZE_V1) {
+		(void) printf("\t\tcomp = %s\n", comp);
+		(void) printf("\t\tuncomp = %s\n", uncomp);
+	}
+	if (size >= sizeof (*bpop)) {
+		(void) printf("\t\tsubobjs = %llu\n",
+		    (u_longlong_t)bpop->bpo_subobjs);
+		(void) printf("\t\tnum_subobjs = %llu\n",
+		    (u_longlong_t)bpop->bpo_num_subobjs);
+	}
+
+	if (dump_opt['d'] < 5)
+		return;
+
+	for (uint64_t i = 0; i < bpop->bpo_num_blkptrs; i++) {
+		char blkbuf[BP_SPRINTF_LEN];
+		blkptr_t bp;
+
+		int err = dmu_read(os, object,
+		    i * sizeof (bp), sizeof (bp), &bp, 0);
+		if (err != 0) {
+			(void) printf("got error %u from dmu_read\n", err);
+			break;
+		}
+		snprintf_blkptr_compact(blkbuf, sizeof (blkbuf), &bp);
+		(void) printf("\t%s\n", blkbuf);
+	}
+}
+
+/* ARGSUSED */
+static void
+dump_bpobj_subobjs(objset_t *os, uint64_t object, void *data, size_t size)
+{
+	dmu_object_info_t doi;
+
+	VERIFY0(dmu_object_info(os, object, &doi));
+	uint64_t *subobjs = kmem_alloc(doi.doi_max_offset, KM_SLEEP);
+
+	int err = dmu_read(os, object, 0, doi.doi_max_offset, subobjs, 0);
+	if (err != 0) {
+		(void) printf("got error %u from dmu_read\n", err);
+		kmem_free(subobjs, doi.doi_max_offset);
+		return;
+	}
+
+	int64_t last_nonzero = -1;
+	for (uint64_t i = 0; i < doi.doi_max_offset / 8; i++) {
+		if (subobjs[i] != 0)
+			last_nonzero = i;
+	}
+
+	for (int64_t i = 0; i <= last_nonzero; i++) {
+		(void) printf("\t%llu\n", (longlong_t)subobjs[i]);
+	}
+	kmem_free(subobjs, doi.doi_max_offset);
+}
+
 /*ARGSUSED*/
 static void
 dump_ddt_zap(objset_t *os, uint64_t object, void *data, size_t size)
@@ -1397,7 +1472,7 @@ dump_bpobj_cb(void *arg, const blkptr_t 
 }
 
 static void
-dump_bpobj(bpobj_t *bpo, char *name, int indent)
+dump_full_bpobj(bpobj_t *bpo, char *name, int indent)
 {
 	char bytes[32];
 	char comp[32];
@@ -1411,11 +1486,12 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 		zdb_nicenum(bpo->bpo_phys->bpo_comp, comp);
 		zdb_nicenum(bpo->bpo_phys->bpo_uncomp, uncomp);
 		(void) printf("    %*s: object %llu, %llu local blkptrs, "
-		    "%llu subobjs, %s (%s/%s comp)\n",
+		    "%llu subobjs in object %llu, %s (%s/%s comp)\n",
 		    indent * 8, name,
 		    (u_longlong_t)bpo->bpo_object,
 		    (u_longlong_t)bpo->bpo_phys->bpo_num_blkptrs,
 		    (u_longlong_t)bpo->bpo_phys->bpo_num_subobjs,
+		    (u_longlong_t)bpo->bpo_phys->bpo_subobjs,
 		    bytes, comp, uncomp);
 
 		for (uint64_t i = 0; i < bpo->bpo_phys->bpo_num_subobjs; i++) {
@@ -1432,7 +1508,7 @@ dump_bpobj(bpobj_t *bpo, char *name, int
 				    error, (u_longlong_t)subobj);
 				continue;
 			}
-			dump_bpobj(&subbpo, "subobj", indent + 1);
+			dump_full_bpobj(&subbpo, "subobj", indent + 1);
 			bpobj_close(&subbpo);
 		}
 	} else {
@@ -1466,7 +1542,7 @@ dump_deadlist(dsl_deadlist_t *dl)
 		return;
 
 	if (dl->dl_oldfmt) {
-		dump_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
+		dump_full_bpobj(&dl->dl_bpobj, "old-format deadlist", 0);
 		return;
 	}
 
@@ -1491,7 +1567,7 @@ dump_deadlist(dsl_deadlist_t *dl)
 			(void) snprintf(buf, sizeof (buf), "mintxg %llu -> "
 			    "obj %llu", (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);
-			dump_bpobj(&dle->dle_bpobj, buf, 0);
+			dump_full_bpobj(&dle->dle_bpobj, buf, 0);
 		} else {
 			(void) printf("mintxg %llu -> obj %llu\n",
 			    (longlong_t)dle->dle_mintxg,
@@ -1682,8 +1758,8 @@ static object_viewer_t *object_viewer[DM
 	dump_uint64,		/* object array			*/
 	dump_none,		/* packed nvlist		*/
 	dump_packed_nvlist,	/* packed nvlist size		*/
-	dump_none,		/* bplist			*/
-	dump_none,		/* bplist header		*/
+	dump_none,		/* bpobj			*/
+	dump_bpobj,		/* bpobj header			*/
 	dump_none,		/* SPA space map header		*/
 	dump_none,		/* SPA space map		*/
 	dump_none,		/* ZIL intent log		*/
@@ -1730,7 +1806,7 @@ static object_viewer_t *object_viewer[DM
 	dump_zap,		/* deadlist			*/
 	dump_none,		/* deadlist hdr			*/
 	dump_zap,		/* dsl clones			*/
-	dump_none,		/* bpobj subobjs		*/
+	dump_bpobj_subobjs,	/* bpobj subobjs		*/
 	dump_unknown,		/* Unknown type, must be last	*/
 };
 
@@ -2959,10 +3035,11 @@ dump_zpool(spa_t *spa)
 		uint64_t refcount;
 		dump_dir(dp->dp_meta_objset);
 		if (dump_opt['d'] >= 3) {
-			dump_bpobj(&spa->spa_deferred_bpobj,
+			dump_full_bpobj(&spa->spa_deferred_bpobj,
 			    "Deferred frees", 0);
 			if (spa_version(spa) >= SPA_VERSION_DEADLISTS) {
-				dump_bpobj(&spa->spa_dsl_pool->dp_free_bpobj,
+				dump_full_bpobj(
+				    &spa->spa_dsl_pool->dp_free_bpobj,
 				    "Pool snapshot frees", 0);
 			}
 

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Wed Aug 12 18:39:49 2015	(r286685)
@@ -939,7 +939,23 @@ Disabling checksums is
 .Em NOT
 a recommended practice.
 .It Sy compression Ns = Ns Cm on | off | lzjb | gzip | gzip- Ns Ar N | Cm zle | Cm lz4
-Controls the compression algorithm used for this dataset. The
+Controls the compression algorithm used for this dataset.
+Setting compression to
+.Cm on
+indicates that the current default compression algorithm should be used.
+The default balances compression and decompression speed, with compression
+ratio and is expected to work well on a wide variety of workloads.
+Unlike all other settings for this property, on does not select a fixed
+compression type.
+As new compression algorithms are added to ZFS and enabled on a pool, the
+default compression algorithm may change.
+The current default compression algorthm is either
+.Cm lzjb
+or, if the
+.Sy lz4_compress
+feature is enabled,
+.Cm lz4 .
+The
 .Cm lzjb
 compression algorithm is optimized for performance while providing decent data
 compression. Setting compression to

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Wed Aug 12 18:39:49 2015	(r286685)
@@ -25,7 +25,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  */
 
 #include <ctype.h>
@@ -34,6 +34,7 @@
 #include <stdlib.h>
 #include <strings.h>
 #include <unistd.h>
+#include <stddef.h>
 
 #include <sys/dmu.h>
 #include <sys/zfs_ioctl.h>
@@ -83,7 +84,6 @@ safe_malloc(size_t size)
  *
  * Read while computing incremental checksum
  */
-
 static size_t
 ssread(void *buf, size_t len, zio_cksum_t *cksum)
 {
@@ -92,7 +92,7 @@ ssread(void *buf, size_t len, zio_cksum_
 	if ((outlen = fread(buf, len, 1, send_stream)) == 0)
 		return (0);
 
-	if (do_cksum && cksum) {
+	if (do_cksum) {
 		if (do_byteswap)
 			fletcher_4_incremental_byteswap(buf, len, cksum);
 		else
@@ -102,6 +102,34 @@ ssread(void *buf, size_t len, zio_cksum_
 	return (outlen);
 }
 
+static size_t
+read_hdr(dmu_replay_record_t *drr, zio_cksum_t *cksum)
+{
+	ASSERT3U(offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum),
+	    ==, sizeof (dmu_replay_record_t) - sizeof (zio_cksum_t));
+	size_t r = ssread(drr, sizeof (*drr) - sizeof (zio_cksum_t), cksum);
+	if (r == 0)
+		return (0);
+	zio_cksum_t saved_cksum = *cksum;
+	r = ssread(&drr->drr_u.drr_checksum.drr_checksum,
+	    sizeof (zio_cksum_t), cksum);
+	if (r == 0)
+		return (0);
+	if (!ZIO_CHECKSUM_IS_ZERO(&drr->drr_u.drr_checksum.drr_checksum) &&
+	    !ZIO_CHECKSUM_EQUAL(saved_cksum,
+	    drr->drr_u.drr_checksum.drr_checksum)) {
+		fprintf(stderr, "invalid checksum\n");
+		(void) printf("Incorrect checksum in record header.\n");
+		(void) printf("Expected checksum = %llx/%llx/%llx/%llx\n",
+		    saved_cksum.zc_word[0],
+		    saved_cksum.zc_word[1],
+		    saved_cksum.zc_word[2],
+		    saved_cksum.zc_word[3]);
+		exit(1);
+	}
+	return (sizeof (*drr));
+}
+
 /*
  * Print part of a block in ASCII characters
  */
@@ -183,8 +211,10 @@ main(int argc, char *argv[])
 	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;
+	struct drr_checksum *drrc = &thedrr.drr_u.drr_checksum;
 	char c;
 	boolean_t verbose = B_FALSE;
+	boolean_t very_verbose = B_FALSE;
 	boolean_t first = B_TRUE;
 	/*
 	 * dump flag controls whether the contents of any modified data blocks
@@ -202,11 +232,14 @@ main(int argc, char *argv[])
 			do_cksum = B_FALSE;
 			break;
 		case 'v':
+			if (verbose)
+				very_verbose = B_TRUE;
 			verbose = B_TRUE;
 			break;
 		case 'd':
 			dump = B_TRUE;
 			verbose = B_TRUE;
+			very_verbose = B_TRUE;
 			break;
 		case ':':
 			(void) fprintf(stderr,
@@ -230,7 +263,7 @@ main(int argc, char *argv[])
 
 	send_stream = stdin;
 	pcksum = zc;
-	while (ssread(drr, sizeof (dmu_replay_record_t), &zc)) {
+	while (read_hdr(drr, &zc)) {
 
 		/*
 		 * If this is the first DMU record being processed, check for
@@ -432,7 +465,7 @@ main(int argc, char *argv[])
 			if (verbose) {
 				(void) printf("WRITE object = %llu type = %u "
 				    "checksum type = %u\n"
-				    "offset = %llu length = %llu "
+				    "    offset = %llu length = %llu "
 				    "props = %llx\n",
 				    (u_longlong_t)drrw->drr_object,
 				    drrw->drr_type,
@@ -476,9 +509,9 @@ main(int argc, char *argv[])
 			if (verbose) {
 				(void) printf("WRITE_BYREF object = %llu "
 				    "checksum type = %u props = %llx\n"
-				    "offset = %llu length = %llu\n"
+				    "    offset = %llu length = %llu\n"
 				    "toguid = %llx refguid = %llx\n"
-				    "refobject = %llu refoffset = %llu\n",
+				    "    refobject = %llu refoffset = %llu\n",
 				    (u_longlong_t)drrwbr->drr_object,
 				    drrwbr->drr_checksumtype,
 				    (u_longlong_t)drrwbr->drr_key.ddk_prop,
@@ -538,7 +571,7 @@ main(int argc, char *argv[])
 			if (verbose) {
 				(void) printf("WRITE_EMBEDDED object = %llu "
 				    "offset = %llu length = %llu\n"
-				    "toguid = %llx comp = %u etype = %u "
+				    "    toguid = %llx comp = %u etype = %u "
 				    "lsize = %u psize = %u\n",
 				    (u_longlong_t)drrwe->drr_object,
 				    (u_longlong_t)drrwe->drr_offset,
@@ -553,6 +586,13 @@ main(int argc, char *argv[])
 			    P2ROUNDUP(drrwe->drr_psize, 8), &zc);
 			break;
 		}
+		if (drr->drr_type != DRR_BEGIN && very_verbose) {
+			(void) printf("    checksum = %llx/%llx/%llx/%llx\n",
+			    (longlong_t)drrc->drr_checksum.zc_word[0],
+			    (longlong_t)drrc->drr_checksum.zc_word[1],
+			    (longlong_t)drrc->drr_checksum.zc_word[2],
+			    (longlong_t)drrc->drr_checksum.zc_word[3]);
+		}
 		pcksum = zc;
 	}
 	free(buf);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Wed Aug 12 18:39:49 2015	(r286685)
@@ -188,10 +188,28 @@ ddt_update(libzfs_handle_t *hdl, dedup_t
 }
 
 static int
-cksum_and_write(const void *buf, uint64_t len, zio_cksum_t *zc, int outfd)
+dump_record(dmu_replay_record_t *drr, void *payload, int payload_len,
+    zio_cksum_t *zc, int outfd)
 {
-	fletcher_4_incremental_native(buf, len, zc);
-	return (write(outfd, buf, len));
+	ASSERT3U(offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum),
+	    ==, sizeof (dmu_replay_record_t) - sizeof (zio_cksum_t));
+	fletcher_4_incremental_native(drr,
+	    offsetof(dmu_replay_record_t, drr_u.drr_checksum.drr_checksum), zc);
+	if (drr->drr_type != DRR_BEGIN) {
+		ASSERT(ZIO_CHECKSUM_IS_ZERO(&drr->drr_u.
+		    drr_checksum.drr_checksum));
+		drr->drr_u.drr_checksum.drr_checksum = *zc;
+	}
+	fletcher_4_incremental_native(&drr->drr_u.drr_checksum.drr_checksum,
+	    sizeof (zio_cksum_t), zc);
+	if (write(outfd, drr, sizeof (*drr)) == -1)
+		return (errno);
+	if (payload_len != 0) {
+		fletcher_4_incremental_native(payload, payload_len, zc);
+		if (write(outfd, payload, payload_len) == -1)
+			return (errno);
+	}
+	return (0);
 }
 
 /*
@@ -218,26 +236,18 @@ cksummer(void *arg)
 	char *buf = zfs_alloc(dda->dedup_hdl, SPA_MAXBLOCKSIZE);
 	dmu_replay_record_t thedrr;
 	dmu_replay_record_t *drr = &thedrr;
-	struct drr_begin *drrb = &thedrr.drr_u.drr_begin;
-	struct drr_end *drre = &thedrr.drr_u.drr_end;
-	struct drr_object *drro = &thedrr.drr_u.drr_object;
-	struct drr_write *drrw = &thedrr.drr_u.drr_write;
-	struct drr_spill *drrs = &thedrr.drr_u.drr_spill;
-	struct drr_write_embedded *drrwe = &thedrr.drr_u.drr_write_embedded;
 	FILE *ofp;
 	int outfd;
-	dmu_replay_record_t wbr_drr = {0};
-	struct drr_write_byref *wbr_drrr = &wbr_drr.drr_u.drr_write_byref;
 	dedup_table_t ddt;
 	zio_cksum_t stream_cksum;
 	uint64_t physmem = sysconf(_SC_PHYS_PAGES) * sysconf(_SC_PAGESIZE);
 	uint64_t numbuckets;
 
 	ddt.max_ddt_size =
-	    MAX((physmem * MAX_DDT_PHYSMEM_PERCENT)/100,
-	    SMALLEST_POSSIBLE_MAX_DDT_MB<<20);
+	    MAX((physmem * MAX_DDT_PHYSMEM_PERCENT) / 100,
+	    SMALLEST_POSSIBLE_MAX_DDT_MB << 20);
 
-	numbuckets = ddt.max_ddt_size/(sizeof (dedup_entry_t));
+	numbuckets = ddt.max_ddt_size / (sizeof (dedup_entry_t));
 
 	/*
 	 * numbuckets must be a power of 2.  Increase number to
@@ -253,32 +263,29 @@ cksummer(void *arg)
 	ddt.numhashbits = high_order_bit(numbuckets) - 1;
 	ddt.ddt_full = B_FALSE;
 
-	/* Initialize the write-by-reference block. */
-	wbr_drr.drr_type = DRR_WRITE_BYREF;
-	wbr_drr.drr_payloadlen = 0;
-
 	outfd = dda->outputfd;
 	ofp = fdopen(dda->inputfd, "r");
-	while (ssread(drr, sizeof (dmu_replay_record_t), ofp) != 0) {
+	while (ssread(drr, sizeof (*drr), ofp) != 0) {
 
 		switch (drr->drr_type) {
 		case DRR_BEGIN:
 		{
-			int	fflags;
+			struct drr_begin *drrb = &drr->drr_u.drr_begin;
+			int fflags;
+			int sz = 0;
 			ZIO_SET_CHECKSUM(&stream_cksum, 0, 0, 0, 0);
 
+			ASSERT3U(drrb->drr_magic, ==, DMU_BACKUP_MAGIC);
+
 			/* set the DEDUP feature flag for this stream */
 			fflags = DMU_GET_FEATUREFLAGS(drrb->drr_versioninfo);
 			fflags |= (DMU_BACKUP_FEATURE_DEDUP |
 			    DMU_BACKUP_FEATURE_DEDUPPROPS);
 			DMU_SET_FEATUREFLAGS(drrb->drr_versioninfo, fflags);
 
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
-				goto out;
 			if (DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
 			    DMU_COMPOUNDSTREAM && drr->drr_payloadlen != 0) {
-				int sz = drr->drr_payloadlen;
+				sz = drr->drr_payloadlen;
 
 				if (sz > SPA_MAXBLOCKSIZE) {
 					buf = zfs_realloc(dda->dedup_hdl, buf,
@@ -287,64 +294,60 @@ cksummer(void *arg)
 				(void) ssread(buf, sz, ofp);
 				if (ferror(stdin))
 					perror("fread");
-				if (cksum_and_write(buf, sz, &stream_cksum,
-				    outfd) == -1)
-					goto out;
 			}
+			if (dump_record(drr, buf, sz, &stream_cksum,
+			    outfd) != 0)
+				goto out;
 			break;
 		}
 
 		case DRR_END:
 		{
+			struct drr_end *drre = &drr->drr_u.drr_end;
 			/* use the recalculated checksum */
-			ZIO_SET_CHECKSUM(&drre->drr_checksum,
-			    stream_cksum.zc_word[0], stream_cksum.zc_word[1],
-			    stream_cksum.zc_word[2], stream_cksum.zc_word[3]);
-			if ((write(outfd, drr,
-			    sizeof (dmu_replay_record_t))) == -1)
+			drre->drr_checksum = stream_cksum;
+			if (dump_record(drr, NULL, 0, &stream_cksum,
+			    outfd) != 0)
 				goto out;
 			break;
 		}
 
 		case DRR_OBJECT:
 		{
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
-				goto out;
+			struct drr_object *drro = &drr->drr_u.drr_object;
 			if (drro->drr_bonuslen > 0) {
 				(void) ssread(buf,
 				    P2ROUNDUP((uint64_t)drro->drr_bonuslen, 8),
 				    ofp);
-				if (cksum_and_write(buf,
-				    P2ROUNDUP((uint64_t)drro->drr_bonuslen, 8),
-				    &stream_cksum, outfd) == -1)
-					goto out;
 			}
+			if (dump_record(drr, buf,
+			    P2ROUNDUP((uint64_t)drro->drr_bonuslen, 8),
+			    &stream_cksum, outfd) != 0)
+				goto out;
 			break;
 		}
 
 		case DRR_SPILL:
 		{
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
-				goto out;
+			struct drr_spill *drrs = &drr->drr_u.drr_spill;
 			(void) ssread(buf, drrs->drr_length, ofp);
-			if (cksum_and_write(buf, drrs->drr_length,
-			    &stream_cksum, outfd) == -1)
+			if (dump_record(drr, buf, drrs->drr_length,
+			    &stream_cksum, outfd) != 0)
 				goto out;
 			break;
 		}
 
 		case DRR_FREEOBJECTS:
 		{
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
+			if (dump_record(drr, NULL, 0, &stream_cksum,
+			    outfd) != 0)
 				goto out;
 			break;
 		}
 
 		case DRR_WRITE:
 		{
+			struct drr_write *drrw = &drr->drr_u.drr_write;
 			dataref_t	dataref;
 
 			(void) ssread(buf, drrw->drr_length, ofp);
@@ -382,7 +385,13 @@ cksummer(void *arg)
 			if (ddt_update(dda->dedup_hdl, &ddt,
 			    &drrw->drr_key.ddk_cksum, drrw->drr_key.ddk_prop,
 			    &dataref)) {
+				dmu_replay_record_t wbr_drr = {0};
+				struct drr_write_byref *wbr_drrr =
+				    &wbr_drr.drr_u.drr_write_byref;
+
 				/* block already present in stream */
+				wbr_drr.drr_type = DRR_WRITE_BYREF;
+
 				wbr_drrr->drr_object = drrw->drr_object;
 				wbr_drrr->drr_offset = drrw->drr_offset;
 				wbr_drrr->drr_length = drrw->drr_length;
@@ -402,19 +411,13 @@ cksummer(void *arg)
 				wbr_drrr->drr_key.ddk_prop =
 				    drrw->drr_key.ddk_prop;
 
-				if (cksum_and_write(&wbr_drr,
-				    sizeof (dmu_replay_record_t), &stream_cksum,
-				    outfd) == -1)
+				if (dump_record(&wbr_drr, NULL, 0,
+				    &stream_cksum, outfd) != 0)
 					goto out;
 			} else {
 				/* block not previously seen */
-				if (cksum_and_write(drr,
-				    sizeof (dmu_replay_record_t), &stream_cksum,
-				    outfd) == -1)
-					goto out;
-				if (cksum_and_write(buf,
-				    drrw->drr_length,
-				    &stream_cksum, outfd) == -1)
+				if (dump_record(drr, buf, drrw->drr_length,
+				    &stream_cksum, outfd) != 0)
 					goto out;
 			}
 			break;
@@ -422,28 +425,27 @@ cksummer(void *arg)
 
 		case DRR_WRITE_EMBEDDED:
 		{
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
-				goto out;
+			struct drr_write_embedded *drrwe =
+			    &drr->drr_u.drr_write_embedded;
 			(void) ssread(buf,
 			    P2ROUNDUP((uint64_t)drrwe->drr_psize, 8), ofp);
-			if (cksum_and_write(buf,
+			if (dump_record(drr, buf,
 			    P2ROUNDUP((uint64_t)drrwe->drr_psize, 8),
-			    &stream_cksum, outfd) == -1)
+			    &stream_cksum, outfd) != 0)
 				goto out;
 			break;
 		}
 
 		case DRR_FREE:
 		{
-			if (cksum_and_write(drr, sizeof (dmu_replay_record_t),
-			    &stream_cksum, outfd) == -1)
+			if (dump_record(drr, NULL, 0, &stream_cksum,
+			    outfd) != 0)
 				goto out;
 			break;
 		}
 
 		default:
-			(void) printf("INVALID record type 0x%x\n",
+			(void) fprintf(stderr, "INVALID record type 0x%x\n",
 			    drr->drr_type);
 			/* should never happen, so assert */
 			assert(B_FALSE);
@@ -1470,18 +1472,11 @@ zfs_send(zfs_handle_t *zhp, const char *
 			    sizeof (drr.drr_u.drr_begin.drr_toname),
 			    "%s@%s", zhp->zfs_name, tosnap);
 			drr.drr_payloadlen = buflen;
-			err = cksum_and_write(&drr, sizeof (drr), &zc, outfd);
 
-			/* write header nvlist */
-			if (err != -1 && packbuf != NULL) {
-				err = cksum_and_write(packbuf, buflen, &zc,
-				    outfd);
-			}
+			err = dump_record(&drr, packbuf, buflen, &zc, outfd);
 			free(packbuf);
-			if (err == -1) {
-				err = errno;
+			if (err != 0)
 				goto stderr_out;
-			}
 
 			/* write end record */
 			bzero(&drr, sizeof (drr));
@@ -1714,6 +1709,8 @@ recv_read(libzfs_handle_t *hdl, int fd, 
 	int rv;
 	int len = ilen;
 
+	assert(ilen <= SPA_MAXBLOCKSIZE);
+
 	do {
 		rv = read(fd, cp, len);
 		cp += rv;

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Wed Aug 12 18:39:49 2015	(r286685)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -532,18 +532,30 @@ lzc_send(const char *snapname, const cha
 }
 
 /*
- * If fromsnap is NULL, a full (non-incremental) stream will be estimated.
+ * "from" can be NULL, a snapshot, or a bookmark.
+ *
+ * If from is NULL, a full (non-incremental) stream will be estimated.  This
+ * is calculated very efficiently.
+ *
+ * If from is a snapshot, lzc_send_space uses the deadlists attached to
+ * each snapshot to efficiently estimate the stream size.
+ *
+ * If from is a bookmark, the indirect blocks in the destination snapshot
+ * are traversed, looking for blocks with a birth time since the creation TXG of
+ * the snapshot this bookmark was created from.  This will result in
+ * significantly more I/O and be less efficient than a send space estimation on
+ * an equivalent snapshot.
  */
 int
-lzc_send_space(const char *snapname, const char *fromsnap, uint64_t *spacep)
+lzc_send_space(const char *snapname, const char *from, uint64_t *spacep)
 {
 	nvlist_t *args;
 	nvlist_t *result;
 	int err;
 
 	args = fnvlist_alloc();
-	if (fromsnap != NULL)
-		fnvlist_add_string(args, "fromsnap", fromsnap);
+	if (from != NULL)
+		fnvlist_add_string(args, "from", from);
 	err = lzc_ioctl(ZFS_IOC_SEND_SPACE, snapname, args, &result);
 	nvlist_free(args);
 	if (err == 0)

Modified: projects/clang-trunk/contrib/apr/CHANGES
==============================================================================
--- projects/clang-trunk/contrib/apr/CHANGES	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/CHANGES	Wed Aug 12 18:39:49 2015	(r286685)
@@ -1,4 +1,63 @@
                                                      -*- coding: utf-8 -*-
+Changes for APR 1.5.2
+
+  *) SECURITY: CVE-2015-1829 (cve.mitre.org)
+     APR applications using APR named pipe support on Windows can be 
+     vulnerable to a pipe squatting attack from a local process; the extent
+     of the vulnerability, when present, depends on the application.
+     Initial analysis and report was provided by John Hernandez of Casaba 
+     Security via HP SSRT Security Alert.  [Yann Ylavic]
+
+  *) apr_atomic: Fix errors when building on Visual Studio 2013 while
+     maintaining the ability to build on Visual Studio 6 with Windows
+     Server 2003 R2 SDK. PR 57191. [Gregg Smith]
+
+  *) Switch to generic atomics for early/unpatched Solaris 10 not exporting
+     some atomic functions.  PR 55418.  [Yann Ylavic]
+
+  *) apr_file_mktemp() on HP-UX: Remove limitation of 26 temporary files
+     per process.  PR 57677.  [Jeff Trawick]
+
+  *) apr_escape: Correctly calculate the size of the returned string in
+     apr_escape_path and set the correct return value in case we actually
+     escape the string. [<aduryagin gmail.com>] PR 57230.
+
+  *) pollcb on Windows: Handle calls with no file/socket descriptors.
+     Follow up to PR 49882. [Jeff Trawick, Yann Ylavic]
+
+  *) apr_poll(cb): fix error paths returned values and leaks.  [Yann Ylavic]
+
+  *) apr_thread_cond_*wait() on BeOS: Fix broken logic.  PR 45800.
+     [Jochen Voss (no e-mail)]
+
+  *) apr_skiplist: Optimize the number of allocations by reusing pooled or
+     malloc()ed nodes for the lifetime of the skiplist.  [Yann Ylavic]
+
+  *) apr_skiplist: Fix possible multiple-free() on the same value in
+     apr_skiplist_remove_all().  [Yann Ylavic]
+
+  *) apr_pollset: On z/OS, threadsafe apr_pollset_poll() may return
+     "EDC8102I Operation would block" under load.
+     [Pat Odonnell <patod us.ibm.com>]
+
+  *) On z/OS, apr_sockaddr_info_get() with family == APR_UNSPEC was not 
+     returning IPv4 addresses if any IPv6 addresses were returned. 
+     [Eric Covener]
+
+  *) Windows cmake build: Fix an incompatibility with cmake 2.8.12 and
+     later.  [Jeff Trawick]
+
+  *) apr_global_mutex/apr_proc_mutex: Resolve failures with the 
+     POSIX sem implementation in environments which receive signals.
+     [Jeff Trawick]
+
+  *) apr_skiplist: Fix potential corruption of skiplists leading to 
+     results or crashes. [Takashi Sato <takashi tks st>, Eric Covener]
+     PR 56654.
+
+  *) Improve platform detection by updating config.guess and config.sub.
+     [Rainer Jung]
+
 Changes for APR 1.5.1
 
   *) apr_os_proc_mutex_get() on Unix:  Avoid segfault for cross-
@@ -37,8 +96,8 @@ Changes for APR 1.5.1
   *) Correct a regression in 1.5.0 which affected out-of-tree
      builds on Unix.  [Rainer Jung]
 
-  *) Improve platform detection for bundled expat by updating
-     config.guess and config.sub. [Rainer Jung]
+  *) Improve platform detection by updating config.guess and config.sub.
+     [Rainer Jung]
 
 Changes for APR 1.5.0
 

Modified: projects/clang-trunk/contrib/apr/CMakeLists.txt
==============================================================================
--- projects/clang-trunk/contrib/apr/CMakeLists.txt	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/CMakeLists.txt	Wed Aug 12 18:39:49 2015	(r286685)
@@ -234,6 +234,7 @@ SET(APR_TEST_SOURCES
   test/testprocmutex.c
   test/testrand.c
   test/testshm.c
+  test/testskiplist.c
   test/testsleep.c
   test/testsock.c
   test/testsockets.c
@@ -252,7 +253,6 @@ SET(APR_TEST_SOURCES
 
 SET(install_targets)
 SET(install_bin_pdb)
-SET(install_lib_pdb)
 
 # libapr-1 is shared, apr-1 is static
 ADD_LIBRARY(libapr-1 SHARED ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED} libapr.rc)
@@ -264,7 +264,6 @@ ADD_DEPENDENCIES(libapr-1 test_char_head
 
 ADD_LIBRARY(apr-1 STATIC ${APR_SOURCES} ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} apr-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/apr-1.pdb)
 TARGET_LINK_LIBRARIES(apr-1 ${APR_SYSTEM_LIBS})
 SET_TARGET_PROPERTIES(apr-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;WINNT")
 ADD_DEPENDENCIES(apr-1 test_char_header)
@@ -272,12 +271,10 @@ ADD_DEPENDENCIES(apr-1 test_char_header)
 # libaprapp-1 and aprapp-1 are static
 ADD_LIBRARY(libaprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} libaprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/libaprapp-1.pdb)
 SET_TARGET_PROPERTIES(libaprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_APP;WINNT")
 
 ADD_LIBRARY(aprapp-1 STATIC misc/win32/apr_app.c misc/win32/internal.c ${APR_PUBLIC_HEADERS_GENERATED})
 SET(install_targets ${install_targets} aprapp-1)
-SET(install_lib_pdb ${install_lib_pdb} ${PROJECT_BINARY_DIR}/aprapp-1.pdb)
 SET_TARGET_PROPERTIES(aprapp-1 PROPERTIES COMPILE_DEFINITIONS "APR_DECLARE_STATIC;APR_APP;WINNT")
 
 IF(APR_BUILD_TESTAPR)
@@ -394,10 +391,6 @@ IF(INSTALL_PDB)
   INSTALL(FILES ${install_bin_pdb}
           DESTINATION bin
           CONFIGURATIONS RelWithDebInfo Debug)
-
-  INSTALL(FILES ${install_lib_pdb}
-          DESTINATION lib
-          CONFIGURATIONS RelWithDebInfo Debug)
 ENDIF()
 
 INSTALL(FILES ${APR_PUBLIC_HEADERS_STATIC} ${APR_PUBLIC_HEADERS_GENERATED} DESTINATION include)

Modified: projects/clang-trunk/contrib/apr/Makefile.in
==============================================================================
--- projects/clang-trunk/contrib/apr/Makefile.in	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/Makefile.in	Wed Aug 12 18:39:49 2015	(r286685)
@@ -129,11 +129,11 @@ check: $(TARGET_LIB)
 etags:
 	etags `find . -name '*.[ch]'`
 
-make_tools_dir:
+OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
+tools/gen_test_char.lo: tools/gen_test_char.c
 	$(APR_MKDIR) tools
+	$(LT_COMPILE)
 
-OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
-tools/gen_test_char.lo: make_tools_dir
 tools/gen_test_char at EXEEXT@: $(OBJECTS_gen_test_char)
 	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
 

Modified: projects/clang-trunk/contrib/apr/NOTICE
==============================================================================
--- projects/clang-trunk/contrib/apr/NOTICE	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/NOTICE	Wed Aug 12 18:39:49 2015	(r286685)
@@ -1,5 +1,5 @@
 Apache Portable Runtime
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2015 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: projects/clang-trunk/contrib/apr/NWGNUmakefile
==============================================================================
--- projects/clang-trunk/contrib/apr/NWGNUmakefile	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/NWGNUmakefile	Wed Aug 12 18:39:49 2015	(r286685)
@@ -50,6 +50,7 @@ include $(APR_WORK)/build/NWGNUhead.inc
 #
 XINCDIRS	+= \
 			$(APR)/include \
+			$(APR)/include/private \
 			$(APR)/include/arch/NetWare \
 			$(APR)/include/arch/unix \
 			$(APR)/memory/unix \
@@ -293,11 +294,13 @@ FILES_nlm_exports = \
 FILES_lib_objs = \
 	$(OBJDIR)/apr_atomic.o \
 	$(OBJDIR)/apr_cpystrn.o \
+	$(OBJDIR)/apr_escape.o \
 	$(OBJDIR)/apr_fnmatch.o \
 	$(OBJDIR)/apr_getpass.o \
 	$(OBJDIR)/apr_hash.o \
 	$(OBJDIR)/apr_pools.o \
 	$(OBJDIR)/apr_random.o \
+	$(OBJDIR)/apr_skiplist.o \
 	$(OBJDIR)/apr_snprintf.o \
 	$(OBJDIR)/apr_strings.o \
 	$(OBJDIR)/apr_strnatcmp.o \
@@ -407,7 +410,7 @@ endif
 vpath %.c atomic/netware:strings:tables:passwd:lib:time/unix
 vpath %.c file_io/unix:locks/netware:misc/netware:misc/unix:threadproc/netware
 vpath %.c poll/unix:shmem/unix:support/unix:random/unix
-vpath %.c dso/netware:memory/unix:mmap/unix:user/netware
+vpath %.c dso/netware:memory/unix:mmap/unix:user/netware:encoding
 
 # Use the win32 network_io if Winsock is being used
 ifndef USE_STDSOCKETS

Modified: projects/clang-trunk/contrib/apr/apr.dsp
==============================================================================
--- projects/clang-trunk/contrib/apr/apr.dsp	Wed Aug 12 18:31:11 2015	(r286684)
+++ projects/clang-trunk/contrib/apr/apr.dsp	Wed Aug 12 18:39:49 2015	(r286685)
@@ -907,69 +907,6 @@ SOURCE=.\include\apr_version.h
 # Begin Source File
 

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

More information about the svn-src-projects mailing list