svn commit: r286858 - in projects/clang-trunk: . bin/sh bin/sh/tests/builtins cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/cmd/zhack cddl/contrib/opens...

Mon Aug 17 19:02:31 UTC 2015

Author: dim
Date: Mon Aug 17 19:02:23 2015
New Revision: 286858
URL: https://svnweb.freebsd.org/changeset/base/286858

Log:
  Merge ^/head r286697 through r286857.

Added:
  projects/clang-trunk/bin/sh/tests/builtins/read8.0
     - copied unchanged from r286857, head/bin/sh/tests/builtins/read8.0
  projects/clang-trunk/lib/libc/secure/
     - copied from r286857, head/lib/libc/secure/
  projects/clang-trunk/lib/libnv/tests/nv_array_tests.cc
     - copied unchanged from r286857, head/lib/libnv/tests/nv_array_tests.cc
  projects/clang-trunk/share/man/man4/man4.arm/am335x_dmtpps.4
     - copied unchanged from r286857, head/share/man/man4/man4.arm/am335x_dmtpps.4
  projects/clang-trunk/sys/arm/ti/am335x/am335x_dmtpps.c
     - copied unchanged from r286857, head/sys/arm/ti/am335x/am335x_dmtpps.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend_ioctl.c
     - copied unchanged from r286857, head/sys/cam/ctl/ctl_frontend_ioctl.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
     - copied unchanged from r286857, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bqueue.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c
     - copied unchanged from r286857, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/multilist.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bqueue.h
     - copied unchanged from r286857, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bqueue.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
     - copied unchanged from r286857, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/multilist.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_priority.h
     - copied unchanged from r286857, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_priority.h
  projects/clang-trunk/sys/dev/random/other_algorithm.c
     - copied unchanged from r286857, head/sys/dev/random/other_algorithm.c
  projects/clang-trunk/sys/dev/random/other_algorithm.h
     - copied unchanged from r286857, head/sys/dev/random/other_algorithm.h
  projects/clang-trunk/sys/dev/random/random_infra.c
     - copied unchanged from r286857, head/sys/dev/random/random_infra.c
  projects/clang-trunk/sys/modules/am335x_dmtpps/
     - copied from r286857, head/sys/modules/am335x_dmtpps/
  projects/clang-trunk/sys/modules/random_fortuna/
     - copied from r286857, head/sys/modules/random_fortuna/
  projects/clang-trunk/sys/modules/random_other/
     - copied from r286857, head/sys/modules/random_other/
  projects/clang-trunk/sys/modules/random_yarrow/
     - copied from r286857, head/sys/modules/random_yarrow/
Deleted:
  projects/clang-trunk/lib/libc/sys/stack_protector.c
  projects/clang-trunk/lib/libc/sys/stack_protector_compat.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend_internal.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend_internal.h
  projects/clang-trunk/sys/dev/random/randomdev_none.c
  projects/clang-trunk/tools/build/options/WITHOUT_ELFTOOLCHAIN_TOOLS
  projects/clang-trunk/tools/build/options/WITHOUT_SYSINSTALL
Modified:
  projects/clang-trunk/Makefile.inc1
  projects/clang-trunk/UPDATING
  projects/clang-trunk/bin/sh/miscbltin.c
  projects/clang-trunk/bin/sh/options.c
  projects/clang-trunk/bin/sh/tests/builtins/Makefile
  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/zfs/zfs_main.c
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zhack/zhack.c
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/clang-trunk/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatditf.c
  projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatunditf.c
  projects/clang-trunk/contrib/gcclibs/libcpp/files.c
  projects/clang-trunk/contrib/tzdata/africa
  projects/clang-trunk/contrib/tzdata/asia
  projects/clang-trunk/contrib/tzdata/europe
  projects/clang-trunk/contrib/tzdata/leap-seconds.list
  projects/clang-trunk/contrib/tzdata/northamerica
  projects/clang-trunk/contrib/tzdata/southamerica
  projects/clang-trunk/contrib/tzdata/zone.tab
  projects/clang-trunk/contrib/tzdata/zone1970.tab
  projects/clang-trunk/gnu/usr.bin/binutils/Makefile
  projects/clang-trunk/lib/Makefile
  projects/clang-trunk/lib/libc/Makefile
  projects/clang-trunk/lib/libc/gen/wordexp.c
  projects/clang-trunk/lib/libc/string/bcopy.3
  projects/clang-trunk/lib/libc/sys/Makefile.inc
  projects/clang-trunk/lib/libc/sys/Symbol.map
  projects/clang-trunk/lib/libgeom/geom_xml2tree.c
  projects/clang-trunk/lib/libnv/tests/Makefile
  projects/clang-trunk/lib/libusb/Makefile
  projects/clang-trunk/sbin/ifconfig/ifconfig.8
  projects/clang-trunk/sbin/ifconfig/iflagg.c
  projects/clang-trunk/sbin/ipfw/ipfw2.c
  projects/clang-trunk/sbin/ping6/Makefile
  projects/clang-trunk/sbin/ping6/ping6.c
  projects/clang-trunk/share/man/man4/em.4
  projects/clang-trunk/share/man/man4/random.4
  projects/clang-trunk/share/man/man4/timecounters.4
  projects/clang-trunk/share/man/man5/src.conf.5
  projects/clang-trunk/share/man/man9/atomic.9
  projects/clang-trunk/share/man/man9/nv.9
  projects/clang-trunk/share/misc/pci_vendors
  projects/clang-trunk/share/mk/bsd.lib.mk
  projects/clang-trunk/share/mk/src.opts.mk
  projects/clang-trunk/share/mk/sys.mk
  projects/clang-trunk/sys/amd64/amd64/pmap.c
  projects/clang-trunk/sys/arm/arm/cpufunc.c
  projects/clang-trunk/sys/arm/arm/identcpu.c
  projects/clang-trunk/sys/arm/arm/pmap-v6-new.c
  projects/clang-trunk/sys/arm/arm/stdatomic.c
  projects/clang-trunk/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
  projects/clang-trunk/sys/arm/conf/BEAGLEBONE
  projects/clang-trunk/sys/arm/include/armreg.h
  projects/clang-trunk/sys/arm/ti/am335x/files.am335x
  projects/clang-trunk/sys/arm/versatile/sp804.c
  projects/clang-trunk/sys/arm64/arm64/bus_machdep.c
  projects/clang-trunk/sys/arm64/arm64/bus_space_asm.S
  projects/clang-trunk/sys/arm64/arm64/exception.S
  projects/clang-trunk/sys/arm64/arm64/trap.c
  projects/clang-trunk/sys/boot/kshim/bsd_kernel.h
  projects/clang-trunk/sys/boot/uboot/fdt/uboot_fdt.c
  projects/clang-trunk/sys/cam/ctl/README.ctl.txt
  projects/clang-trunk/sys/cam/ctl/ctl.c
  projects/clang-trunk/sys/cam/ctl/ctl.h
  projects/clang-trunk/sys/cam/ctl/ctl_backend.c
  projects/clang-trunk/sys/cam/ctl/ctl_backend_block.c
  projects/clang-trunk/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang-trunk/sys/cam/ctl/ctl_cmd_table.c
  projects/clang-trunk/sys/cam/ctl/ctl_error.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend_cam_sim.c
  projects/clang-trunk/sys/cam/ctl/ctl_frontend_iscsi.c
  projects/clang-trunk/sys/cam/ctl/ctl_ioctl.h
  projects/clang-trunk/sys/cam/ctl/ctl_private.h
  projects/clang-trunk/sys/cam/ctl/ctl_tpc.c
  projects/clang-trunk/sys/cam/ctl/ctl_tpc_local.c
  projects/clang-trunk/sys/cddl/compat/opensolaris/sys/nvpair.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.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_diff.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.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/dmu_tx.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.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_dataset.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_pool.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/spa.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.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/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/dsl_dataset.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/zap.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.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_vfsops.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.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_inject.c
  projects/clang-trunk/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  projects/clang-trunk/sys/compat/cloudabi/cloudabi_proc.c
  projects/clang-trunk/sys/conf/Makefile.arm
  projects/clang-trunk/sys/conf/NOTES
  projects/clang-trunk/sys/conf/files
  projects/clang-trunk/sys/conf/files.amd64
  projects/clang-trunk/sys/conf/kern.post.mk
  projects/clang-trunk/sys/conf/kern.pre.mk
  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/contrib/libnv/nvlist_impl.h
  projects/clang-trunk/sys/contrib/libnv/nvpair.c
  projects/clang-trunk/sys/contrib/libnv/nvpair_impl.h
  projects/clang-trunk/sys/dev/ata/ata-all.c
  projects/clang-trunk/sys/dev/ata/ata-all.h
  projects/clang-trunk/sys/dev/ath/if_ath.c
  projects/clang-trunk/sys/dev/ath/if_ath_keycache.c
  projects/clang-trunk/sys/dev/ath/if_ath_rx.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/bxe/ecore_hsi.h
  projects/clang-trunk/sys/dev/e1000/e1000_80003es2lan.c
  projects/clang-trunk/sys/dev/e1000/e1000_80003es2lan.h
  projects/clang-trunk/sys/dev/e1000/e1000_82540.c
  projects/clang-trunk/sys/dev/e1000/e1000_82541.c
  projects/clang-trunk/sys/dev/e1000/e1000_82541.h
  projects/clang-trunk/sys/dev/e1000/e1000_82542.c
  projects/clang-trunk/sys/dev/e1000/e1000_82543.c
  projects/clang-trunk/sys/dev/e1000/e1000_82543.h
  projects/clang-trunk/sys/dev/e1000/e1000_82571.c
  projects/clang-trunk/sys/dev/e1000/e1000_82571.h
  projects/clang-trunk/sys/dev/e1000/e1000_82575.c
  projects/clang-trunk/sys/dev/e1000/e1000_82575.h
  projects/clang-trunk/sys/dev/e1000/e1000_api.c
  projects/clang-trunk/sys/dev/e1000/e1000_api.h
  projects/clang-trunk/sys/dev/e1000/e1000_defines.h
  projects/clang-trunk/sys/dev/e1000/e1000_hw.h
  projects/clang-trunk/sys/dev/e1000/e1000_i210.c
  projects/clang-trunk/sys/dev/e1000/e1000_i210.h
  projects/clang-trunk/sys/dev/e1000/e1000_ich8lan.c
  projects/clang-trunk/sys/dev/e1000/e1000_ich8lan.h
  projects/clang-trunk/sys/dev/e1000/e1000_mac.c
  projects/clang-trunk/sys/dev/e1000/e1000_mac.h
  projects/clang-trunk/sys/dev/e1000/e1000_manage.c
  projects/clang-trunk/sys/dev/e1000/e1000_manage.h
  projects/clang-trunk/sys/dev/e1000/e1000_mbx.c
  projects/clang-trunk/sys/dev/e1000/e1000_mbx.h
  projects/clang-trunk/sys/dev/e1000/e1000_nvm.c
  projects/clang-trunk/sys/dev/e1000/e1000_nvm.h
  projects/clang-trunk/sys/dev/e1000/e1000_osdep.c
  projects/clang-trunk/sys/dev/e1000/e1000_osdep.h
  projects/clang-trunk/sys/dev/e1000/e1000_phy.c
  projects/clang-trunk/sys/dev/e1000/e1000_phy.h
  projects/clang-trunk/sys/dev/e1000/e1000_regs.h
  projects/clang-trunk/sys/dev/e1000/e1000_vf.c
  projects/clang-trunk/sys/dev/e1000/e1000_vf.h
  projects/clang-trunk/sys/dev/e1000/if_em.c
  projects/clang-trunk/sys/dev/e1000/if_em.h
  projects/clang-trunk/sys/dev/e1000/if_igb.c
  projects/clang-trunk/sys/dev/e1000/if_igb.h
  projects/clang-trunk/sys/dev/e1000/if_lem.c
  projects/clang-trunk/sys/dev/e1000/if_lem.h
  projects/clang-trunk/sys/dev/gpio/gpiobus.c
  projects/clang-trunk/sys/dev/gpio/gpioled.c
  projects/clang-trunk/sys/dev/md/md.c
  projects/clang-trunk/sys/dev/random/fortuna.c
  projects/clang-trunk/sys/dev/random/random_harvestq.c
  projects/clang-trunk/sys/dev/random/random_harvestq.h
  projects/clang-trunk/sys/dev/random/randomdev.c
  projects/clang-trunk/sys/dev/random/randomdev.h
  projects/clang-trunk/sys/dev/random/unit_test.c
  projects/clang-trunk/sys/dev/random/yarrow.c
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.c
  projects/clang-trunk/sys/dev/usb/controller/dwc_otg.h
  projects/clang-trunk/sys/dev/usb/controller/usb_controller.c
  projects/clang-trunk/sys/dev/usb/usb_bus.h
  projects/clang-trunk/sys/dev/usb/usb_device.c
  projects/clang-trunk/sys/dev/usb/usb_hub.c
  projects/clang-trunk/sys/dev/usb/usb_pf.c
  projects/clang-trunk/sys/dev/usb/usb_process.h
  projects/clang-trunk/sys/dev/usb/usb_transfer.c
  projects/clang-trunk/sys/dev/usb/usbdi.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/vt/hw/vga/vt_vga_reg.h
  projects/clang-trunk/sys/dev/vt/vt_core.c
  projects/clang-trunk/sys/dev/xen/netfront/netfront.c
  projects/clang-trunk/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang-trunk/sys/kern/genassym.sh
  projects/clang-trunk/sys/kern/kern_exit.c
  projects/clang-trunk/sys/kern/kern_tc.c
  projects/clang-trunk/sys/modules/Makefile
  projects/clang-trunk/sys/modules/ctl/Makefile
  projects/clang-trunk/sys/modules/gpio/gpiobus/Makefile
  projects/clang-trunk/sys/net/ieee8023ad_lacp.c
  projects/clang-trunk/sys/net/ieee8023ad_lacp.h
  projects/clang-trunk/sys/net/if_lagg.c
  projects/clang-trunk/sys/net/if_lagg.h
  projects/clang-trunk/sys/netinet/if_ether.c
  projects/clang-trunk/sys/netinet/sctp_timer.c
  projects/clang-trunk/sys/ofed/drivers/infiniband/core/cma.c
  projects/clang-trunk/sys/powerpc/powerpc/trap.c
  projects/clang-trunk/sys/sys/ata.h
  projects/clang-trunk/sys/sys/nv.h
  projects/clang-trunk/sys/sys/random.h
  projects/clang-trunk/sys/sys/socketvar.h
  projects/clang-trunk/sys/sys/timeet.h
  projects/clang-trunk/sys/sys/timetc.h
  projects/clang-trunk/sys/teken/demo/teken_demo.c
  projects/clang-trunk/sys/teken/teken.c
  projects/clang-trunk/sys/vm/vm_pageout.c
  projects/clang-trunk/sys/x86/iommu/intel_idpgtbl.c
  projects/clang-trunk/sys/x86/x86/busdma_bounce.c
  projects/clang-trunk/sys/xen/gnttab.h
  projects/clang-trunk/targets/pseudo/toolchain/Makefile.depend
  projects/clang-trunk/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang-trunk/tools/tools/nanobsd/gateworks/common
  projects/clang-trunk/usr.bin/Makefile
  projects/clang-trunk/usr.bin/ctlstat/ctlstat.c
  projects/clang-trunk/usr.bin/lorder/lorder.1
  projects/clang-trunk/usr.bin/lorder/lorder.sh
  projects/clang-trunk/usr.bin/patch/common.h
  projects/clang-trunk/usr.bin/patch/inp.c
  projects/clang-trunk/usr.bin/patch/patch.1
  projects/clang-trunk/usr.bin/patch/pch.c
  projects/clang-trunk/usr.bin/patch/util.c
  projects/clang-trunk/usr.bin/patch/util.h
  projects/clang-trunk/usr.bin/truss/syscall.h
  projects/clang-trunk/usr.bin/truss/syscalls.c
  projects/clang-trunk/usr.bin/ypcat/ypcat.c
  projects/clang-trunk/usr.bin/ypwhich/ypwhich.c
  projects/clang-trunk/usr.sbin/bhyve/pci_ahci.c
  projects/clang-trunk/usr.sbin/ctladm/ctladm.8
  projects/clang-trunk/usr.sbin/ctladm/ctladm.c
  projects/clang-trunk/usr.sbin/ctld/kernel.c
  projects/clang-trunk/usr.sbin/pw/pw_user.c
  projects/clang-trunk/usr.sbin/pw/tests/pw_useradd.sh
  projects/clang-trunk/usr.sbin/wlandebug/wlandebug.8
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/compiler-rt/   (props changed)
  projects/clang-trunk/contrib/tzdata/   (props changed)
  projects/clang-trunk/gnu/usr.bin/binutils/   (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/boot/   (props changed)
  projects/clang-trunk/sys/cddl/contrib/opensolaris/   (props changed)
  projects/clang-trunk/sys/conf/   (props changed)
  projects/clang-trunk/targets/   (props changed)
  projects/clang-trunk/usr.sbin/bhyve/   (props changed)

Modified: projects/clang-trunk/Makefile.inc1
==============================================================================

--- projects/clang-trunk/Makefile.inc1	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/Makefile.inc1	Mon Aug 17 19:02:23 2015	(r286858)
@@ -220,7 +220,7 @@ INSTALLTMP!=	/usr/bin/mktemp -d -u -t in
 #	This stage is responsible for creating the object
 #	tree and building any tools that are needed during
 #	the build process. Some programs are listed during
-#	this phase because they build binaires to generate
+#	this phase because they build binaries to generate
 #	files needed to build these programs. This stage also
 #	builds the 'build-tools' target rather than 'all'.
 # 3. cross-tools stage [XMAKE]
@@ -1494,7 +1494,7 @@ _btxld=		usr.sbin/btxld
 .if ${MK_BINUTILS_BOOTSTRAP} != "no"
 _binutils=	gnu/usr.bin/binutils
 .endif
-.if ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 _elftctools=	lib/libelftc \
 		usr.bin/elfcopy \
 		usr.bin/nm \
@@ -1504,7 +1504,7 @@ _elftctools=	lib/libelftc \
 # cross-build on a FreeBSD 10 host:
 _elftctools+=	usr.bin/addr2line
 .endif
-.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_TOOLS} != "no"
+.elif ${TARGET_ARCH} != ${MACHINE_ARCH} && ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
 # If cross-building with an external binutils we still need to build strip for
 # the target (for at least crunchide).
 _elftctools=	lib/libelftc \

Modified: projects/clang-trunk/UPDATING
==============================================================================
--- projects/clang-trunk/UPDATING	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/UPDATING	Mon Aug 17 19:02:23 2015	(r286858)
@@ -36,6 +36,26 @@ 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.
 
+20150817:
+	Kernel-loadable modules for the random(4) device are back. To use
+	them, the kernel must have
+
+	device	random
+	options	RANDOM_LOADABLE
+
+	kldload(8) can then be used to load random_fortuna.ko
+	or random_yarrow.ko. Please note that due to the indirect
+	function calls that the loadable modules need to provide,
+	the build-in variants will be slightly more efficient.
+
+	The random(4) kernel option RANDOM_DUMMY has been retired due to
+	unpopularity. It was not all that useful anyway.
+
+20150813:
+	The WITHOUT_ELFTOOLCHAIN_TOOLS src.conf(5) knob has been retired.
+	Control over building the ELF Tool Chain tools is now provided by
+	the WITHOUT_TOOLCHAIN knob.
+
 20150810:
 	The polarity of Pulse Per Second (PPS) capture events with the
 	uart(4) driver has been corrected.  Prior to this change the PPS

Modified: projects/clang-trunk/bin/sh/miscbltin.c
==============================================================================
--- projects/clang-trunk/bin/sh/miscbltin.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/bin/sh/miscbltin.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -191,9 +191,10 @@ readcmd(int argc __unused, char **argv _
 		CHECKSTRSPACE(1, p);
 		if (backslash) {
 			backslash = 0;
-			startword = 0;
-			if (c != '\n')
+			if (c != '\n') {
+				startword = 0;
 				USTPUTC(c, p);
+			}
 			continue;
 		}
 		if (!rflag && c == '\\') {

Modified: projects/clang-trunk/bin/sh/options.c
==============================================================================
--- projects/clang-trunk/bin/sh/options.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/bin/sh/options.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -73,6 +73,7 @@ char *minusc;			/* argument to -c option
 static void options(int);
 static void minus_o(char *, int);
 static void setoption(int, int);
+static void setoptionbyindex(int, int);
 static int getopts(char *, char *, char **, char ***, char **);
 
 
@@ -269,7 +270,7 @@ minus_o(char *name, int val)
 	} else {
 		for (i = 0; i < NOPTS; i++)
 			if (equal(name, optlist[i].name)) {
-				setoption(optlist[i].letter, val);
+				setoptionbyindex(i, val);
 				return;
 			}
 		error("Illegal option -o %s", name);
@@ -278,26 +279,32 @@ minus_o(char *name, int val)
 
 
 static void
-setoption(int flag, int val)
+setoptionbyindex(int idx, int val)
 {
-	int i;
-
-	if (flag == 'p' && !val && privileged) {
+	if (optlist[idx].letter == 'p' && !val && privileged) {
 		if (setgid(getgid()) == -1)
 			error("setgid");
 		if (setuid(getuid()) == -1)
 			error("setuid");
 	}
+	optlist[idx].val = val;
+	if (val) {
+		/* #%$ hack for ksh semantics */
+		if (optlist[idx].letter == 'V')
+			Eflag = 0;
+		else if (optlist[idx].letter == 'E')
+			Vflag = 0;
+	}
+}
+
+static void
+setoption(int flag, int val)
+{
+	int i;
+
 	for (i = 0; i < NOPTS; i++)
 		if (optlist[i].letter == flag) {
-			optlist[i].val = val;
-			if (val) {
-				/* #%$ hack for ksh semantics */
-				if (flag == 'V')
-					Eflag = 0;
-				else if (flag == 'E')
-					Vflag = 0;
-			}
+			setoptionbyindex(i, val);
 			return;
 		}
 	error("Illegal option -%c", flag);

Modified: projects/clang-trunk/bin/sh/tests/builtins/Makefile
==============================================================================
--- projects/clang-trunk/bin/sh/tests/builtins/Makefile	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/bin/sh/tests/builtins/Makefile	Mon Aug 17 19:02:23 2015	(r286858)
@@ -121,6 +121,7 @@ FILES+=		read4.0 read4.0.stdout
 FILES+=		read5.0
 FILES+=		read6.0
 FILES+=		read7.0
+FILES+=		read8.0
 FILES+=		return1.0
 FILES+=		return2.1
 FILES+=		return3.1

Copied: projects/clang-trunk/bin/sh/tests/builtins/read8.0 (from r286857, head/bin/sh/tests/builtins/read8.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang-trunk/bin/sh/tests/builtins/read8.0	Mon Aug 17 19:02:23 2015	(r286858, copy of r286857, head/bin/sh/tests/builtins/read8.0)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+read a b c <<\EOF
+\
+A\
+ \
+ \
+ \
+B\
+ \
+ \
+C\
+ \
+ \
+ \
+EOF
+[ "$a.$b.$c" = "A.B.C" ]

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zdb/zdb.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  */
 
 #include <stdio.h>
@@ -2221,7 +2221,7 @@ dump_label(const char *dev)
 	(void) close(fd);
 }
 
-static uint64_t num_large_blocks;
+static uint64_t dataset_feature_count[SPA_FEATURES];
 
 /*ARGSUSED*/
 static int
@@ -2235,8 +2235,15 @@ dump_one_dir(const char *dsname, void *a
 		(void) printf("Could not open %s, error %d\n", dsname, error);
 		return (0);
 	}
-	if (dmu_objset_ds(os)->ds_large_blocks)
-		num_large_blocks++;
+
+	for (spa_feature_t f = 0; f < SPA_FEATURES; f++) {
+		if (!dmu_objset_ds(os)->ds_feature_inuse[f])
+			continue;
+		ASSERT(spa_feature_table[f].fi_flags &
+		    ZFEATURE_FLAG_PER_DATASET);
+		dataset_feature_count[f]++;
+	}
+
 	dump_dir(os);
 	dmu_objset_disown(os, FTAG);
 	fuid_table_destroy();
@@ -2428,6 +2435,9 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
 	dmu_object_type_t type;
 	boolean_t is_metadata;
 
+	if (bp == NULL)
+		return (0);
+
 	if (dump_opt['b'] >= 5 && bp->blk_birth > 0) {
 		char blkbuf[BP_SPRINTF_LEN];
 		snprintf_blkptr(blkbuf, sizeof (blkbuf), bp);
@@ -2917,7 +2927,7 @@ zdb_ddt_add_cb(spa_t *spa, zilog_t *zilo
 	avl_index_t where;
 	zdb_ddt_entry_t *zdde, zdde_search;
 
-	if (BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
+	if (bp == NULL || BP_IS_HOLE(bp) || BP_IS_EMBEDDED(bp))
 		return (0);
 
 	if (dump_opt['S'] > 1 && zb->zb_level == ZB_ROOT_LEVEL) {
@@ -3032,7 +3042,6 @@ dump_zpool(spa_t *spa)
 		dump_metaslab_groups(spa);
 
 	if (dump_opt['d'] || dump_opt['i']) {
-		uint64_t refcount;
 		dump_dir(dp->dp_meta_objset);
 		if (dump_opt['d'] >= 3) {
 			dump_full_bpobj(&spa->spa_deferred_bpobj,
@@ -3054,17 +3063,29 @@ dump_zpool(spa_t *spa)
 		(void) dmu_objset_find(spa_name(spa), dump_one_dir,
 		    NULL, DS_FIND_SNAPSHOTS | DS_FIND_CHILDREN);
 
-		(void) feature_get_refcount(spa,
-		    &spa_feature_table[SPA_FEATURE_LARGE_BLOCKS], &refcount);
-		if (num_large_blocks != refcount) {
-			(void) printf("large_blocks feature refcount mismatch: "
-			    "expected %lld != actual %lld\n",
-			    (longlong_t)num_large_blocks,
-			    (longlong_t)refcount);
-			rc = 2;
-		} else {
-			(void) printf("Verified large_blocks feature refcount "
-			    "is correct (%llu)\n", (longlong_t)refcount);
+		for (spa_feature_t f = 0; f < SPA_FEATURES; f++) {
+			uint64_t refcount;
+
+			if (!(spa_feature_table[f].fi_flags &
+			    ZFEATURE_FLAG_PER_DATASET)) {
+				ASSERT0(dataset_feature_count[f]);
+				continue;
+			}
+			(void) feature_get_refcount(spa,
+			    &spa_feature_table[f], &refcount);
+			if (dataset_feature_count[f] != refcount) {
+				(void) printf("%s feature refcount mismatch: "
+				    "%lld datasets != %lld refcount\n",
+				    spa_feature_table[f].fi_uname,
+				    (longlong_t)dataset_feature_count[f],
+				    (longlong_t)refcount);
+				rc = 2;
+			} else {
+				(void) printf("Verified %s feature refcount "
+				    "of %llu is correct\n",
+				    spa_feature_table[f].fi_uname,
+				    (longlong_t)refcount);
+			}
 		}
 	}
 	if (rc == 0 && (dump_opt['b'] || dump_opt['c']))

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Mon Aug 17 19:02:23 2015	(r286858)
@@ -191,11 +191,13 @@
 .Nm
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
+.Op Fl o Sy origin Ns = Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Op Fl d | e
+.Op Fl o Sy origin Ns = Ns Ar snapshot
 .Ar filesystem
 .Nm
 .Cm allow
@@ -2705,6 +2707,7 @@ feature.
 .Nm
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
+.Op Fl o Sy origin Ns = Ns Ar snapshot
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .It Xo
@@ -2712,6 +2715,7 @@ feature.
 .Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Op Fl d | e
+.Op Fl o Sy origin Ns = Ns Ar snapshot
 .Ar filesystem
 .Xc
 .Pp
@@ -2796,6 +2800,10 @@ receive operation.
 Do not actually receive the stream. This can be useful in conjunction with the
 .Fl v
 option to verify the name the receive operation would use.
+.It Fl o Sy origin Ns = Ns Ar snapshot
+Forces the stream to be received as a clone of the given snapshot.
+This is only valid if the stream is an incremental stream whose source
+is the same as the provided origin.
 .It Fl F
 Force a rollback of the file system to the most recent snapshot before
 performing the receive operation. If receiving an incremental replication

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -264,8 +264,9 @@ get_usage(zfs_help_t idx)
 		return (gettext("\tpromote <clone-filesystem>\n"));
 	case HELP_RECEIVE:
 		return (gettext("\treceive|recv [-vnFu] <filesystem|volume|"
-		"snapshot>\n"
-		"\treceive|recv [-vnFu] [-d | -e] <filesystem>\n"));
+		    "snapshot>\n"
+		    "\treceive|recv [-vnFu] [-o origin=<snapshot>] [-d | -e] "
+		    "<filesystem>\n"));
 	case HELP_RENAME:
 		return (gettext("\trename [-f] <filesystem|volume|snapshot> "
 		    "<filesystem|volume|snapshot>\n"
@@ -791,7 +792,7 @@ zfs_do_create(int argc, char **argv)
 				nomem();
 			break;
 		case 'o':
-			if (parseprop(props, optarg))
+			if (parseprop(props, optarg) != 0)
 				goto error;
 			break;
 		case 's':
@@ -3659,7 +3660,7 @@ zfs_do_snapshot(int argc, char **argv)
 	while ((c = getopt(argc, argv, "ro:")) != -1) {
 		switch (c) {
 		case 'o':
-			if (parseprop(props, optarg))
+			if (parseprop(props, optarg) != 0)
 				return (1);
 			break;
 		case 'r':
@@ -3918,10 +3919,19 @@ zfs_do_receive(int argc, char **argv)
 {
 	int c, err;
 	recvflags_t flags = { 0 };
+	nvlist_t *props;
+	nvpair_t *nvp = NULL;
+
+	if (nvlist_alloc(&props, NV_UNIQUE_NAME, 0) != 0)
+		nomem();
 
 	/* check options */
-	while ((c = getopt(argc, argv, ":denuvF")) != -1) {
+	while ((c = getopt(argc, argv, ":o:denuvF")) != -1) {
 		switch (c) {
+		case 'o':
+			if (parseprop(props, optarg) != 0)
+				return (1);
+			break;
 		case 'd':
 			flags.isprefix = B_TRUE;
 			break;
@@ -3966,6 +3976,13 @@ zfs_do_receive(int argc, char **argv)
 		usage(B_FALSE);
 	}
 
+	while ((nvp = nvlist_next_nvpair(props, nvp))) {
+		if (strcmp(nvpair_name(nvp), "origin") != 0) {
+			(void) fprintf(stderr, gettext("invalid option"));
+			usage(B_FALSE);
+		}
+	}
+
 	if (isatty(STDIN_FILENO)) {
 		(void) fprintf(stderr,
 		    gettext("Error: Backup stream can not be read "
@@ -3974,7 +3991,7 @@ zfs_do_receive(int argc, char **argv)
 		return (1);
 	}
 
-	err = zfs_receive(g_zfs, argv[0], &flags, STDIN_FILENO, NULL);
+	err = zfs_receive(g_zfs, argv[0], props, &flags, STDIN_FILENO, NULL);
 
 	return (err != 0);
 }

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zhack/zhack.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zhack/zhack.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2013 Steven Hartland. All rights reserved.
  */
 
@@ -294,8 +294,8 @@ zhack_feature_enable_sync(void *arg, dmu
 	feature_enable_sync(spa, feature, tx);
 
 	spa_history_log_internal(spa, "zhack enable feature", tx,
-	    "name=%s can_readonly=%u",
-	    feature->fi_guid, feature->fi_can_readonly);
+	    "guid=%s flags=%x",
+	    feature->fi_guid, feature->fi_flags);
 }
 
 static void
@@ -314,9 +314,7 @@ zhack_do_feature_enable(int argc, char *
 	 */
 	desc = NULL;
 	feature.fi_uname = "zhack";
-	feature.fi_mos = B_FALSE;
-	feature.fi_can_readonly = B_FALSE;
-	feature.fi_activate_on_enable = B_FALSE;
+	feature.fi_flags = 0;
 	feature.fi_depends = nodeps;
 	feature.fi_feature = SPA_FEATURE_NONE;
 
@@ -324,7 +322,7 @@ zhack_do_feature_enable(int argc, char *
 	while ((c = getopt(argc, argv, "rmd:")) != -1) {
 		switch (c) {
 		case 'r':
-			feature.fi_can_readonly = B_TRUE;
+			feature.fi_flags |= ZFEATURE_FLAG_READONLY_COMPAT;
 			break;
 		case 'd':
 			desc = strdup(optarg);
@@ -413,7 +411,7 @@ zhack_do_feature_ref(int argc, char **ar
 	 * disk later.
 	 */
 	feature.fi_uname = "zhack";
-	feature.fi_mos = B_FALSE;
+	feature.fi_flags = 0;
 	feature.fi_desc = NULL;
 	feature.fi_depends = nodeps;
 	feature.fi_feature = SPA_FEATURE_NONE;
@@ -422,7 +420,7 @@ zhack_do_feature_ref(int argc, char **ar
 	while ((c = getopt(argc, argv, "md")) != -1) {
 		switch (c) {
 		case 'm':
-			feature.fi_mos = B_TRUE;
+			feature.fi_flags |= ZFEATURE_FLAG_MOS;
 			break;
 		case 'd':
 			decr = B_TRUE;
@@ -455,10 +453,10 @@ zhack_do_feature_ref(int argc, char **ar
 
 	if (0 == zap_contains(mos, spa->spa_feat_for_read_obj,
 	    feature.fi_guid)) {
-		feature.fi_can_readonly = B_FALSE;
+		feature.fi_flags &= ~ZFEATURE_FLAG_READONLY_COMPAT;
 	} else if (0 == zap_contains(mos, spa->spa_feat_for_write_obj,
 	    feature.fi_guid)) {
-		feature.fi_can_readonly = B_TRUE;
+		feature.fi_flags |= ZFEATURE_FLAG_READONLY_COMPAT;
 	} else {
 		fatal(spa, FTAG, "feature is not enabled: %s", feature.fi_guid);
 	}

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -22,7 +22,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
- * Copyright (c) 2011, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2015 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2012 Martin Matuska <mm at FreeBSD.org>. All rights reserved.
  * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
@@ -4986,7 +4986,8 @@ zpool_do_upgrade(int argc, char **argv)
 		    "---------------\n");
 		for (i = 0; i < SPA_FEATURES; i++) {
 			zfeature_info_t *fi = &spa_feature_table[i];
-			const char *ro = fi->fi_can_readonly ?
+			const char *ro =
+			    (fi->fi_flags & ZFEATURE_FLAG_READONLY_COMPAT) ?
 			    " (read-only compatible)" : "";
 
 			(void) printf("%-37s%s\n", fi->fi_uname, ro);

Modified: projects/clang-trunk/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/cmd/ztest/ztest.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -3586,7 +3586,8 @@ ztest_dmu_read_write(ztest_ds_t *zd, uin
 	 */
 	n = ztest_random(regions) * stride + ztest_random(width);
 	s = 1 + ztest_random(2 * width - 1);
-	dmu_prefetch(os, bigobj, n * chunksize, s * chunksize);
+	dmu_prefetch(os, bigobj, 0, n * chunksize, s * chunksize,
+	    ZIO_PRIORITY_SYNC_READ);
 
 	/*
 	 * Pick a random index and compute the offsets into packobj and bigobj.
@@ -5705,8 +5706,10 @@ ztest_run(ztest_shared_t *zs)
 	 * Right before closing the pool, kick off a bunch of async I/O;
 	 * spa_close() should wait for it to complete.
 	 */
-	for (uint64_t object = 1; object < 50; object++)
-		dmu_prefetch(spa->spa_meta_objset, object, 0, 1ULL << 20);
+	for (uint64_t object = 1; object < 50; object++) {
+		dmu_prefetch(spa->spa_meta_objset, object, 0, 0, 1ULL << 20,
+		    ZIO_PRIORITY_SYNC_READ);
+	}
 
 	spa_close(spa, FTAG);
 
@@ -5905,6 +5908,7 @@ ztest_init(ztest_shared_t *zs)
 	}
 	VERIFY3U(0, ==, spa_create(ztest_opts.zo_pool, nvroot, props, NULL));
 	nvlist_free(nvroot);
+	nvlist_free(props);
 
 	VERIFY3U(0, ==, spa_open(ztest_opts.zo_pool, &spa, FTAG));
 	zs->zs_metaslab_sz =

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Mon Aug 17 19:02:23 2015	(r286858)
@@ -668,8 +668,8 @@ typedef struct recvflags {
 	boolean_t nomount;
 } recvflags_t;
 
-extern int zfs_receive(libzfs_handle_t *, const char *, recvflags_t *,
-    int, avl_tree_t *);
+extern int zfs_receive(libzfs_handle_t *, const char *, nvlist_t *,
+    recvflags_t *, int, avl_tree_t *);
 
 typedef enum diff_flags {
 	ZFS_DIFF_PARSEABLE = 0x1,

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -3535,7 +3535,7 @@ zpool_vdev_name(libzfs_handle_t *hdl, zp
 }
 
 static int
-zbookmark_compare(const void *a, const void *b)
+zbookmark_mem_compare(const void *a, const void *b)
 {
 	return (memcmp(a, b, sizeof (zbookmark_phys_t)));
 }
@@ -3598,7 +3598,7 @@ zpool_get_errlog(zpool_handle_t *zhp, nv
 	    zc.zc_nvlist_dst_size;
 	count -= zc.zc_nvlist_dst_size;
 
-	qsort(zb, count, sizeof (zbookmark_phys_t), zbookmark_compare);
+	qsort(zb, count, sizeof (zbookmark_phys_t), zbookmark_mem_compare);
 
 	verify(nvlist_alloc(nverrlistp, 0, KM_SLEEP) == 0);
 

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	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -64,8 +64,9 @@ extern void zfs_setprop_error(libzfs_han
 /* We need to use something for ENODATA. */
 #define	ENODATA	EIDRM
 
-static int zfs_receive_impl(libzfs_handle_t *, const char *, recvflags_t *,
-    int, const char *, nvlist_t *, avl_tree_t *, char **, int, uint64_t *);
+static int zfs_receive_impl(libzfs_handle_t *, const char *, const char *,
+    recvflags_t *, int, const char *, nvlist_t *, avl_tree_t *, char **, int,
+    uint64_t *);
 
 static const zio_cksum_t zero_cksum = { 0 };
 
@@ -2498,7 +2499,7 @@ zfs_receive_package(libzfs_handle_t *hdl
 		 * zfs_receive_one() will take care of it (ie,
 		 * recv_skip() and return 0).
 		 */
-		error = zfs_receive_impl(hdl, destname, flags, fd,
+		error = zfs_receive_impl(hdl, destname, NULL, flags, fd,
 		    sendfs, stream_nv, stream_avl, top_zfs, cleanup_fd,
 		    action_handlep);
 		if (error == ENODATA) {
@@ -2631,9 +2632,9 @@ recv_skip(libzfs_handle_t *hdl, int fd, 
  */
 static int
 zfs_receive_one(libzfs_handle_t *hdl, int infd, const char *tosnap,
-    recvflags_t *flags, dmu_replay_record_t *drr,
-    dmu_replay_record_t *drr_noswap, const char *sendfs,
-    nvlist_t *stream_nv, avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
+    const char *originsnap, recvflags_t *flags, dmu_replay_record_t *drr,
+    dmu_replay_record_t *drr_noswap, const char *sendfs, nvlist_t *stream_nv,
+    avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
     uint64_t *action_handlep)
 {
 	zfs_cmd_t zc = { 0 };
@@ -2798,10 +2799,15 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 		}
 		if (flags->verbose)
 			(void) printf("found clone origin %s\n", zc.zc_string);
+	} else if (originsnap) {
+		(void) strncpy(zc.zc_string, originsnap, ZFS_MAXNAMELEN);
+		if (flags->verbose)
+			(void) printf("using provided clone origin %s\n",
+			    zc.zc_string);
 	}
 
 	stream_wantsnewfs = (drrb->drr_fromguid == 0 ||
-	    (drrb->drr_flags & DRR_FLAG_CLONE));
+	    (drrb->drr_flags & DRR_FLAG_CLONE) || originsnap);
 
 	if (stream_wantsnewfs) {
 		/*
@@ -3179,9 +3185,10 @@ zfs_receive_one(libzfs_handle_t *hdl, in
 }
 
 static int
-zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap, recvflags_t *flags,
-    int infd, const char *sendfs, nvlist_t *stream_nv, avl_tree_t *stream_avl,
-    char **top_zfs, int cleanup_fd, uint64_t *action_handlep)
+zfs_receive_impl(libzfs_handle_t *hdl, const char *tosnap,
+    const char *originsnap, recvflags_t *flags, int infd, const char *sendfs,
+    nvlist_t *stream_nv, avl_tree_t *stream_avl, char **top_zfs, int cleanup_fd,
+    uint64_t *action_handlep)
 {
 	int err;
 	dmu_replay_record_t drr, drr_noswap;
@@ -3200,6 +3207,12 @@ zfs_receive_impl(libzfs_handle_t *hdl, c
 		    "(%s) does not exist"), tosnap);
 		return (zfs_error(hdl, EZFS_NOENT, errbuf));
 	}
+	if (originsnap &&
+	    !zfs_dataset_exists(hdl, originsnap, ZFS_TYPE_DATASET)) {
+		zfs_error_aux(hdl, dgettext(TEXT_DOMAIN, "specified origin fs "
+		    "(%s) does not exist"), originsnap);
+		return (zfs_error(hdl, EZFS_NOENT, errbuf));
+	}
 
 	/* read in the BEGIN record */
 	if (0 != (err = recv_read(hdl, infd, &drr, sizeof (drr), B_FALSE,
@@ -3272,14 +3285,14 @@ zfs_receive_impl(libzfs_handle_t *hdl, c
 				*cp = '\0';
 			sendfs = nonpackage_sendfs;
 		}
-		return (zfs_receive_one(hdl, infd, tosnap, flags,
-		    &drr, &drr_noswap, sendfs, stream_nv, stream_avl,
-		    top_zfs, cleanup_fd, action_handlep));
+		return (zfs_receive_one(hdl, infd, tosnap, originsnap, flags,
+		    &drr, &drr_noswap, sendfs, stream_nv, stream_avl, top_zfs,
+		    cleanup_fd, action_handlep));
 	} else {
 		assert(DMU_GET_STREAM_HDRTYPE(drrb->drr_versioninfo) ==
 		    DMU_COMPOUNDSTREAM);
-		return (zfs_receive_package(hdl, infd, tosnap, flags,
-		    &drr, &zcksum, top_zfs, cleanup_fd, action_handlep));
+		return (zfs_receive_package(hdl, infd, tosnap, flags, &drr,
+		    &zcksum, top_zfs, cleanup_fd, action_handlep));
 	}
 }
 
@@ -3290,18 +3303,24 @@ zfs_receive_impl(libzfs_handle_t *hdl, c
  * (-1 will override -2).
  */
 int
-zfs_receive(libzfs_handle_t *hdl, const char *tosnap, recvflags_t *flags,
-    int infd, avl_tree_t *stream_avl)
+zfs_receive(libzfs_handle_t *hdl, const char *tosnap, nvlist_t *props,
+    recvflags_t *flags, int infd, avl_tree_t *stream_avl)
 {
 	char *top_zfs = NULL;
 	int err;
 	int cleanup_fd;
 	uint64_t action_handle = 0;
+	char *originsnap = NULL;
+	if (props) {
+		err = nvlist_lookup_string(props, "origin", &originsnap);
+		if (err && err != ENOENT)
+			return (err);
+	}
 
 	cleanup_fd = open(ZFS_DEV, O_RDWR|O_EXCL);
 	VERIFY(cleanup_fd >= 0);
 
-	err = zfs_receive_impl(hdl, tosnap, flags, infd, NULL, NULL,
+	err = zfs_receive_impl(hdl, tosnap, originsnap, flags, infd, NULL, NULL,
 	    stream_avl, &top_zfs, cleanup_fd, &action_handle);
 
 	VERIFY(0 == close(cleanup_fd));

Modified: projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
==============================================================================
--- projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h	Mon Aug 17 19:02:23 2015	(r286858)
@@ -135,8 +135,18 @@ extern int aok;
 
 /*
  * DTrace SDT probes have different signatures in userland than they do in
- * kernel.  If they're being used in kernel code, re-define them out of
+ * the kernel.  If they're being used in kernel code, re-define them out of
  * existence for their counterparts in libzpool.
+ *
+ * Here's an example of how to use the set-error probes in userland:
+ * zfs$target:::set-error /arg0 == EBUSY/ {stack();}
+ *
+ * Here's an example of how to use DTRACE_PROBE probes in userland:
+ * If there is a probe declared as follows:
+ * DTRACE_PROBE2(zfs__probe_name, uint64_t, blkid, dnode_t *, dn);
+ * Then you can use it as follows:
+ * zfs$target:::probe2 /copyinstr(arg0) == "zfs__probe_name"/
+ *     {printf("%u %p\n", arg1, arg2);}
  */
 
 #ifdef DTRACE_PROBE

Modified: projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatditf.c
==============================================================================
--- projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatditf.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatditf.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -34,7 +34,7 @@ COMPILER_RT_ABI fp_t __floatditf(di_int 
     }
 
     // Exponent of (fp_t)a is the width of abs(a).
-    const int exponent = (aWidth - 1) - __builtin_clz(a);
+    const int exponent = (aWidth - 1) - __builtin_clzll(a);
     rep_t result;
 
     // Shift a into the significand field and clear the implicit bit.  Extra

Modified: projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatunditf.c
==============================================================================
--- projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatunditf.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/compiler-rt/lib/builtins/floatunditf.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -25,7 +25,7 @@ COMPILER_RT_ABI fp_t __floatunditf(du_in
     if (a == 0) return fromRep(0);
 
     // Exponent of (fp_t)a is the width of abs(a).
-    const int exponent = (aWidth - 1) - __builtin_clz(a);
+    const int exponent = (aWidth - 1) - __builtin_clzll(a);
     rep_t result;
 
     // Shift a into the significand field and clear the implicit bit.

Modified: projects/clang-trunk/contrib/gcclibs/libcpp/files.c
==============================================================================
--- projects/clang-trunk/contrib/gcclibs/libcpp/files.c	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/gcclibs/libcpp/files.c	Mon Aug 17 19:02:23 2015	(r286858)
@@ -567,7 +567,7 @@ read_file_guts (cpp_reader *pfile, _cpp_
 	 SSIZE_MAX to be much smaller than the actual range of the
 	 type.  Use INTTYPE_MAXIMUM unconditionally to ensure this
 	 does not bite us.  */
-      if (file->st.st_size > INTTYPE_MAXIMUM (ssize_t))
+      if (file->st.st_size > SSIZE_MAX)
 	{
 	  cpp_error (pfile, CPP_DL_ERROR, "%s is too large", file->path);
 	  return false;
@@ -581,7 +581,7 @@ read_file_guts (cpp_reader *pfile, _cpp_
 	    file->path);
 	  return false;
 	}
-      else if (offset > INTTYPE_MAXIMUM (ssize_t) || (ssize_t)offset > size)
+      else if (offset > SSIZE_MAX || (ssize_t)offset > size)
 	{
 	  cpp_error (pfile, CPP_DL_ERROR, "current position of %s is too large",
 	    file->path);

Modified: projects/clang-trunk/contrib/tzdata/africa
==============================================================================
--- projects/clang-trunk/contrib/tzdata/africa	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/tzdata/africa	Mon Aug 17 19:02:23 2015	(r286858)
@@ -538,7 +538,7 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 
 # From Alex Krivenyshev (2008-07-11):
 # Seems that English language article "The revival of daylight saving
-# time: Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
 # published on Monday, June 30, 2008...
 #
 # I guess that article in French "Le gouvernement avance l'introduction
@@ -670,7 +670,7 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907
 # Here is a link to official document from Royaume du Maroc Premier Ministre,
 # Ministère de la Modernisation des Secteurs Publics
 #
-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 june 1967)
+# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
 # concerning the amendment of the legal time, the Ministry of Modernization of
 # Public Sectors announced that the official time in the Kingdom will be
 # advanced 60 minutes from Sunday 31 May 2009 at midnight.

Modified: projects/clang-trunk/contrib/tzdata/asia
==============================================================================
--- projects/clang-trunk/contrib/tzdata/asia	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/tzdata/asia	Mon Aug 17 19:02:23 2015	(r286858)
@@ -6,7 +6,7 @@
 # tz at iana.org for general use in the future).  For more, please see
 # the file CONTRIBUTING in the tz distribution.
 
-# From Paul Eggert (2014-10-31):
+# From Paul Eggert (2015-08-08):
 #
 # Unless otherwise specified, the source for data through 1990 is:
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -43,7 +43,7 @@
 #	2:00 EET  EEST	Eastern European Time
 #	2:00 IST  IDT	Israel
 #	3:00 AST  ADT	Arabia*
-#	3:30 IRST IRDT	Iran
+#	3:30 IRST IRDT	Iran*
 #	4:00 GST	Gulf*
 #	5:30 IST	India
 #	7:00 ICT	Indochina, most times and locations*
@@ -52,10 +52,11 @@
 #	8:00 CST	China
 #	8:00 IDT	Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
 #	8:00 JWST	Western Standard Time (Japan, 1896/1937)*
+#	8:30 KST  KDT	Korea when at +0830*
 #	9:00 JCST	Central Standard Time (Japan, 1896/1937)
 #	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
-#	9:00 KST  KDT	Korea
+#	9:00 KST  KDT	Korea when at +09
 #	9:30 ACST	Australian Central Standard Time
 #
 # See the 'europe' file for Russia and Turkey in Asia.
@@ -1027,7 +1028,7 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 No
 #
 # From Roozbeh Pournader (2007-11-05):
 # This is quoted from Official Gazette of the Islamic Republic of
-# Iran, Volume 63, Number 18242, dated Tuesday 1386/6/24
+# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
 # [2007-10-16]. I am doing the best translation I can:...
 # The official time of the country will be moved forward for one hour
 # on the 24 hours of the first day of the month of Farvardin and will
@@ -1557,7 +1558,7 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
 # - Qyzylorda switched from +5:00 to +6:00 on 1992-01-19 02:00.
 # - Oral switched from +5:00 to +4:00 in spring 1989.
 
-# From Kazakhstan Embassy's News Bulletin #11
+# From Kazakhstan Embassy's News Bulletin No. 11
 # <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
 # The Government of Kazakhstan passed a resolution March 15 abolishing
 # daylight saving time citing lack of economic benefits and health
@@ -1711,6 +1712,17 @@ Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
 #
 # For Pyongyang we have no information; guess no changes since World War II.
 
+# From Steffen Thorsen (2015-08-07):
+# According to many news sources, North Korea is going to change to
+# the 8:30 time zone on August 15, one example:
+# http://www.bbc.com/news/world-asia-33815049
+#
+# From Paul Eggert (2015-08-07):
+# No transition time is specified; assume 00:00.
+# There is no common English-language abbreviation for this time zone.
+# Use %z rather than invent one.  We can't assume %z works everywhere yet,
+# so for now substitute its output manually.
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
 			8:30	-	KST	1912 Jan  1
@@ -1723,7 +1735,8 @@ Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 A
 			8:30	-	KST	1912 Jan  1
 			9:00	-	JCST	1937 Oct  1
 			9:00	-	JST	1945 Aug 24
-			9:00	-	KST
+			9:00	-	KST	2015 Aug 15
+			8:30	-	KST
 
 ###############################################################################
 

Modified: projects/clang-trunk/contrib/tzdata/europe
==============================================================================
--- projects/clang-trunk/contrib/tzdata/europe	Mon Aug 17 18:47:39 2015	(r286857)
+++ projects/clang-trunk/contrib/tzdata/europe	Mon Aug 17 19:02:23 2015	(r286858)
@@ -193,11 +193,14 @@
 #	republished in Finest Hour (Spring 2002) 1(114):26
 #	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
 
-# From Paul Eggert (1996-09-03):
+# From Paul Eggert (2015-08-08):
 # The OED Supplement says that the English originally said "Daylight Saving"
 # when they were debating the adoption of DST in 1908; but by 1916 this
 # term appears only in quotes taken from DST's opponents, whereas the
 # proponents (who eventually won the argument) are quoted as using "Summer".
+# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
+# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
+# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
 
 # From Arthur David Olson (1989-01-19):
 # A source at the British Information Office in New York avers that it's
@@ -343,7 +346,7 @@
 
 # From an anonymous contributor (1996-06-02):
 # The law governing time in Ireland is under Statutory Instrument SI 395/94,
-# which gives force to European Union 7th Council Directive # 94/21/EC.
+# which gives force to European Union 7th Council Directive No. 94/21/EC.
 # Under this directive, the Minister for Justice in Ireland makes appropriate
 # regulations. I spoke this morning with the Secretary of the Department of
 # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
@@ -592,11 +595,11 @@ Rule	Russia	1921	only	-	Feb	14	23:00	1:0
 Rule	Russia	1921	only	-	Mar	20	23:00	2:00	MSM  # Midsummer
 Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
 Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
-# Act No.925 of the Council of Ministers of the USSR (1980-10-24):
+# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
 Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
 Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
-# Act No.967 of the Council of Ministers of the USSR (1984-09-13), repeated in
-# Act No.227 of the Council of Ministers of the USSR (1989-03-14):
+# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
+# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
 Rule	Russia	1984	1991	-	Sep	lastSun	 2:00s	0	-
 Rule	Russia	1985	1991	-	Mar	lastSun	 2:00s	1:00	S
 #
@@ -828,7 +831,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 # Bulgaria
 #
 # From Plamen Simenov via Steffen Thorsen (1999-09-09):
-# A document of Government of Bulgaria (No.94/1997) says:
+# A document of Government of Bulgaria (No. 94/1997) says:
 # EET -> EETDST is in 03:00 Local time in last Sunday of March ...
 # EETDST -> EET is in 04:00 Local time in last Sunday of October
 #
@@ -845,7 +848,7 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			1:00	C-Eur	CE%sT	1945
 			1:00	-	CET	1945 Apr  2  3:00
 			2:00	-	EET	1979 Mar 31 23:00
-			2:00	Bulg	EE%sT	1982 Sep 26  2:00
+			2:00	Bulg	EE%sT	1982 Sep 26  3:00
 			2:00	C-Eur	EE%sT	1991
 			2:00	E-Eur	EE%sT	1997
 			2:00	EU	EE%sT
@@ -1062,8 +1065,8 @@ Zone America/Thule	-4:35:08 -	LMT	1916 J
 # after that.
 
 # From Mart Oruaas (2000-01-29):
-# Regulation no. 301 (1999-10-12) obsoletes previous regulation
-# no. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
+# Regulation No. 301 (1999-10-12) obsoletes previous regulation
+# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
 # the year round.  The regulation is effective 1999-11-01.
 
 # From Toomas Soome (2002-02-21):
@@ -1084,7 +1087,7 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
 			2:00	1:00	EEST	1989 Sep 24  2:00s
 			2:00	C-Eur	EE%sT	1998 Sep 22
-			2:00	EU	EE%sT	1999 Nov  1
+			2:00	EU	EE%sT	1999 Oct 31  4:00
 			2:00	-	EET	2002 Feb 21
 			2:00	EU	EE%sT
 
@@ -1527,21 +1530,21 @@ Link	Europe/Rome	Europe/San_Marino
 # correct data in juridical acts and I found some juridical documents about
 # changes in the counting of time in Latvia from 1981....
 #
-# Act No.35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
-# according to the Act No.925 of the Council of Ministers of USSR of 1980-10-24
+# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
+# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
 # and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
 #
-# Act No.592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
-# according to the Act No.967 of the Council of Ministers of USSR of 1984-09-13
+# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
+# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
 # ...: all year round the time of 2nd time zone + 1 hour, in addition turning
 # the hands of the clock 1 hour forward on the last Sunday of March at 02:00
 # (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
 # September at 03:00 (GMT 23:00 on the previous day).
 #
-# Act No.81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
-# according to the Act No.227 of the Council of Ministers of USSR of 1989-03-14
+# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
+# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
 # ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
 # Estonian SSR and Kaliningrad region of Russian Federation all year round the
 # time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
@@ -1558,7 +1561,7 @@ Link	Europe/Rome	Europe/San_Marino
 # From Andrei Ivanov (2000-03-06):
 # This year Latvia will not switch to Daylight Savings Time (as specified in
 # The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
-# 29-Feb-2000 (#79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
+# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
 # in Latvian for subscribers only).
 
 # From RFE/RL Newsline
@@ -1763,6 +1766,18 @@ Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov
 # News from Moldova (in russian):
 # http://ru.publika.md/link_317061.html
 
+# From Roman Tudos (2015-07-02):
+# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
+# From Paul Eggert (2015-07-01):
+# The abovementioned official link to IGO1445-868/2014 states that
+# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
+# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
+# says the 2014-03-30 spring-forward transition was at 02:00 local time.
+# Guess that since 1997 Moldova has switched one hour before the EU.
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
+Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Chisinau	1:55:20 -	LMT	1880
@@ -1777,7 +1792,7 @@ Zone	Europe/Chisinau	1:55:20 -	LMT	1880
 			2:00	Russia	EE%sT	1992
 			2:00	E-Eur	EE%sT	1997
 # See Romania commentary for the guessed 1997 transition to EU rules.
-			2:00	EU	EE%sT
+			2:00	Moldova	EE%sT
 
 # Monaco
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
@@ -2123,7 +2138,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891
 # Russia
 
 # From Alexander Krivenyshev (2011-09-15):
-# Based on last Russian Government Decree # 725 on August 31, 2011
+# Based on last Russian Government Decree No. 725 on August 31, 2011
 # (Government document
 # http://www.government.ru/gov/results/16355/print/
 # in Russian)
@@ -2133,7 +2148,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891
 # http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
 

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