From owner-svn-src-projects@freebsd.org  Thu Apr 27 12:59:18 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F246ED53187
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Thu, 27 Apr 2017 12:59:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA2E5BD1;
 Thu, 27 Apr 2017 12:59:18 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3RCxH0w064322;
 Thu, 27 Apr 2017 12:59:17 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3RCxFcO064296;
 Thu, 27 Apr 2017 12:59:15 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201704271259.v3RCxFcO064296@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 27 Apr 2017 12:59:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r317503 - in projects/clang500-import: . bin/sh
 bin/sh/tests/expansion cddl/contrib/opensolaris/cmd/zfs
 cddl/contrib/opensolaris/cmd/zstreamdump
 cddl/contrib/opensolaris/lib/libzfs/comm...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Apr 2017 12:59:19 -0000

Author: dim
Date: Thu Apr 27 12:59:14 2017
New Revision: 317503
URL: https://svnweb.freebsd.org/changeset/base/317503

Log:
  Merge ^/head r317281 through r317502.

Added:
  projects/clang500-import/bin/sh/tests/expansion/cmdsubst24.0
     - copied unchanged from r317502, head/bin/sh/tests/expansion/cmdsubst24.0
  projects/clang500-import/tools/build/options/WITHOUT_GDB_LIBEXEC
     - copied unchanged from r317502, head/tools/build/options/WITHOUT_GDB_LIBEXEC
  projects/clang500-import/tools/build/options/WITH_GDB_LIBEXEC
     - copied unchanged from r317502, head/tools/build/options/WITH_GDB_LIBEXEC
  projects/clang500-import/tools/regression/geom_gpt/Makefile
     - copied unchanged from r317502, head/tools/regression/geom_gpt/Makefile
  projects/clang500-import/tools/regression/geom_gpt/gctl_test.t
     - copied unchanged from r317502, head/tools/regression/geom_gpt/gctl_test.t
  projects/clang500-import/tools/regression/geom_gpt/gctl_test_helper.c
     - copied unchanged from r317502, head/tools/regression/geom_gpt/gctl_test_helper.c
Deleted:
  projects/clang500-import/etc/rc.d/atm1
  projects/clang500-import/etc/rc.d/atm2
  projects/clang500-import/etc/rc.d/atm3
  projects/clang500-import/sbin/atm/
  projects/clang500-import/share/man/man4/cy.4
  projects/clang500-import/share/man/man4/en.4
  projects/clang500-import/share/man/man4/fatm.4
  projects/clang500-import/share/man/man4/hatm.4
  projects/clang500-import/share/man/man4/natm.4
  projects/clang500-import/share/man/man4/natmip.4
  projects/clang500-import/share/man/man4/ng_atm.4
  projects/clang500-import/share/man/man4/patm.4
  projects/clang500-import/share/man/man4/utopia.4
  projects/clang500-import/sys/dev/ahb/
  projects/clang500-import/sys/dev/cy/
  projects/clang500-import/sys/dev/digi/
  projects/clang500-import/sys/dev/eisa/
  projects/clang500-import/sys/dev/en/
  projects/clang500-import/sys/dev/fatm/
  projects/clang500-import/sys/dev/hatm/
  projects/clang500-import/sys/dev/ieee488/
  projects/clang500-import/sys/dev/patm/
  projects/clang500-import/sys/dev/utopia/
  projects/clang500-import/sys/modules/ahb/
  projects/clang500-import/sys/modules/aic7xxx/ahc/ahc_eisa/
  projects/clang500-import/sys/modules/en/
  projects/clang500-import/sys/modules/fatm/
  projects/clang500-import/sys/modules/hatm/
  projects/clang500-import/sys/modules/netgraph/atm/atm/
  projects/clang500-import/sys/modules/patm/
  projects/clang500-import/sys/modules/utopia/
  projects/clang500-import/sys/net/if_atm.h
  projects/clang500-import/sys/net/if_atmsubr.c
  projects/clang500-import/sys/netgraph/atm/ng_atm.c
  projects/clang500-import/sys/netgraph/atm/ng_atm.h
  projects/clang500-import/sys/netinet/if_atm.c
  projects/clang500-import/sys/netinet/if_atm.h
  projects/clang500-import/sys/netnatm/
  projects/clang500-import/tools/regression/geom_gpt/gctl.t
  projects/clang500-import/tools/regression/geom_gpt/test.c
  projects/clang500-import/usr.sbin/bsnmpd/modules/snmp_atm/
  projects/clang500-import/usr.sbin/ppp/atm.c
  projects/clang500-import/usr.sbin/ppp/atm.h
Modified:
  projects/clang500-import/ObsoleteFiles.inc
  projects/clang500-import/UPDATING
  projects/clang500-import/bin/sh/options.c
  projects/clang500-import/bin/sh/tests/expansion/Makefile
  projects/clang500-import/bin/sh/trap.c
  projects/clang500-import/bin/sh/trap.h
  projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/clang500-import/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
  projects/clang500-import/contrib/elftoolchain/elfcopy/main.c
  projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
  projects/clang500-import/contrib/tcpdump/tcpdump.c
  projects/clang500-import/etc/defaults/rc.conf
  projects/clang500-import/etc/mtree/BSD.usr.dist
  projects/clang500-import/etc/netstart
  projects/clang500-import/etc/network.subr
  projects/clang500-import/etc/rc.d/Makefile
  projects/clang500-import/etc/rc.d/routing
  projects/clang500-import/gnu/usr.bin/gdb/Makefile
  projects/clang500-import/gnu/usr.bin/gdb/Makefile.inc
  projects/clang500-import/include/Makefile
  projects/clang500-import/lib/libbsnmp/libbsnmp/Makefile
  projects/clang500-import/lib/libc/gen/getpagesize.3
  projects/clang500-import/lib/libc/gen/getpagesize.c
  projects/clang500-import/lib/libc/gen/scandir.c
  projects/clang500-import/lib/libc/net/getnameinfo.c
  projects/clang500-import/lib/libc/regex/cname.h
  projects/clang500-import/lib/libc/regex/regcomp.c
  projects/clang500-import/lib/libc/regex/regerror.c
  projects/clang500-import/lib/libc/regex/regex2.h
  projects/clang500-import/lib/libc/regex/regexec.c
  projects/clang500-import/lib/libc/regex/regfree.c
  projects/clang500-import/lib/libgeom/geom_ctl.c
  projects/clang500-import/lib/libgeom/geom_stats.c
  projects/clang500-import/lib/libgeom/libgeom.3
  projects/clang500-import/lib/librpcsec_gss/svc_rpcsec_gss.c
  projects/clang500-import/lib/msun/src/e_asin.c
  projects/clang500-import/release/scripts/pkg-stage.sh
  projects/clang500-import/rescue/rescue/Makefile
  projects/clang500-import/sbin/Makefile
  projects/clang500-import/sbin/fsck_ffs/fsck.h
  projects/clang500-import/sbin/fsck_ffs/globs.c
  projects/clang500-import/sbin/fsck_ffs/inode.c
  projects/clang500-import/sbin/fsck_ffs/setup.c
  projects/clang500-import/sbin/ipfw/ipv6.c
  projects/clang500-import/share/man/man4/Makefile
  projects/clang500-import/share/man/man4/u3g.4
  projects/clang500-import/share/man/man4/uark.4
  projects/clang500-import/share/man/man4/uart.4
  projects/clang500-import/share/man/man4/ubsa.4
  projects/clang500-import/share/man/man4/ubser.4
  projects/clang500-import/share/man/man4/uchcom.4
  projects/clang500-import/share/man/man4/ucom.4
  projects/clang500-import/share/man/man4/ucycom.4
  projects/clang500-import/share/man/man4/uftdi.4
  projects/clang500-import/share/man/man4/uipaq.4
  projects/clang500-import/share/man/man4/umcs.4
  projects/clang500-import/share/man/man4/umct.4
  projects/clang500-import/share/man/man4/umodem.4
  projects/clang500-import/share/man/man4/umoscom.4
  projects/clang500-import/share/man/man4/uplcom.4
  projects/clang500-import/share/man/man4/uslcom.4
  projects/clang500-import/share/man/man4/uvisor.4
  projects/clang500-import/share/man/man4/uvscom.4
  projects/clang500-import/share/man/man5/rc.conf.5
  projects/clang500-import/share/man/man7/hier.7
  projects/clang500-import/share/man/man9/Makefile
  projects/clang500-import/share/man/man9/zone.9
  projects/clang500-import/share/mk/src.opts.mk
  projects/clang500-import/sys/arm/arm/gic.c
  projects/clang500-import/sys/arm64/arm64/vm_machdep.c
  projects/clang500-import/sys/boot/forth/loader.conf
  projects/clang500-import/sys/cam/ctl/ctl.c
  projects/clang500-import/sys/cam/ctl/ctl_backend_block.c
  projects/clang500-import/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/clang500-import/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/clang500-import/sys/compat/linux/linux_ioctl.c
  projects/clang500-import/sys/compat/linux/linux_ioctl.h
  projects/clang500-import/sys/compat/linux/linux_time.c
  projects/clang500-import/sys/conf/NOTES
  projects/clang500-import/sys/conf/config.mk
  projects/clang500-import/sys/conf/files
  projects/clang500-import/sys/conf/options
  projects/clang500-import/sys/conf/options.arm64
  projects/clang500-import/sys/dev/ahci/ahci.c
  projects/clang500-import/sys/dev/ahci/ahci.h
  projects/clang500-import/sys/dev/ahci/ahci_generic.c
  projects/clang500-import/sys/dev/bhnd/bcma/bcma_erom.c
  projects/clang500-import/sys/dev/bhnd/bhnd_erom.h
  projects/clang500-import/sys/dev/bhnd/bhnd_erom_if.m
  projects/clang500-import/sys/dev/bhnd/nvram/bhnd_nvram_data_sprom.c
  projects/clang500-import/sys/dev/bhnd/siba/siba_erom.c
  projects/clang500-import/sys/dev/cxgbe/cxgbei/icl_cxgbei.c
  projects/clang500-import/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
  projects/clang500-import/sys/dev/hyperv/netvsc/if_hn.c
  projects/clang500-import/sys/dev/isp/isp.c
  projects/clang500-import/sys/dev/ntb/if_ntb/if_ntb.c
  projects/clang500-import/sys/dev/ntb/ntb.c
  projects/clang500-import/sys/dev/ntb/ntb_if.m
  projects/clang500-import/sys/dev/ntb/ntb_transport.c
  projects/clang500-import/sys/dev/ntb/ntb_transport.h
  projects/clang500-import/sys/dev/psci/psci.c
  projects/clang500-import/sys/dev/psci/psci.h
  projects/clang500-import/sys/dev/syscons/scvgarndr.c
  projects/clang500-import/sys/fs/nfs/nfsport.h
  projects/clang500-import/sys/fs/nfsclient/nfs_clrpcops.c
  projects/clang500-import/sys/fs/nfsclient/nfs_clstate.c
  projects/clang500-import/sys/fs/nfsclient/nfs_clvfsops.c
  projects/clang500-import/sys/fs/nfsserver/nfs_nfsdstate.c
  projects/clang500-import/sys/kern/uipc_socket.c
  projects/clang500-import/sys/kern/vfs_bio.c
  projects/clang500-import/sys/mips/broadcom/bcm_machdep.c
  projects/clang500-import/sys/modules/Makefile
  projects/clang500-import/sys/modules/netgraph/atm/Makefile
  projects/clang500-import/sys/net/netisr.h
  projects/clang500-import/sys/netgraph/ng_atmllc.c
  projects/clang500-import/sys/netinet/sctp_usrreq.c
  projects/clang500-import/sys/netinet/sctp_var.h
  projects/clang500-import/sys/netinet/sctputil.c
  projects/clang500-import/sys/netinet/tcp_input.c
  projects/clang500-import/sys/netinet/tcp_lro.c
  projects/clang500-import/sys/netinet/tcp_stacks/fastpath.c
  projects/clang500-import/sys/netinet6/ip6_output.c
  projects/clang500-import/sys/netinet6/sctp6_usrreq.c
  projects/clang500-import/sys/netinet6/sctp6_var.h
  projects/clang500-import/sys/netipsec/ipsec_pcb.c
  projects/clang500-import/sys/netpfil/pf/pf_if.c
  projects/clang500-import/sys/netpfil/pf/pf_table.c
  projects/clang500-import/sys/sys/param.h
  projects/clang500-import/sys/x86/include/segments.h
  projects/clang500-import/tools/build/mk/OptionalObsoleteFiles.inc
  projects/clang500-import/tools/tools/net80211/scripts/setup.wdsmain
  projects/clang500-import/tools/tools/net80211/wlanwds/wlanwds.c
  projects/clang500-import/tools/tools/umastat/umastat.c
  projects/clang500-import/usr.bin/diff/diffreg.c
  projects/clang500-import/usr.bin/getaddrinfo/Makefile
  projects/clang500-import/usr.bin/grep/tests/grep_freebsd_test.sh
  projects/clang500-import/usr.bin/kdump/kdump.c
  projects/clang500-import/usr.bin/sed/sed.1
  projects/clang500-import/usr.sbin/bhyve/pci_passthru.c
  projects/clang500-import/usr.sbin/bsnmpd/modules/Makefile
  projects/clang500-import/usr.sbin/crashinfo/crashinfo.sh
  projects/clang500-import/usr.sbin/fstyp/fstyp.8
  projects/clang500-import/usr.sbin/fstyp/fstyp.c
  projects/clang500-import/usr.sbin/nfsuserd/nfsuserd.c
  projects/clang500-import/usr.sbin/ntp/sntp/Makefile
  projects/clang500-import/usr.sbin/pmcstat/pmcpl_calltree.c
  projects/clang500-import/usr.sbin/pmcstat/pmcstat_log.c
  projects/clang500-import/usr.sbin/ppp/Makefile
  projects/clang500-import/usr.sbin/ppp/physical.c
Directory Properties:
  projects/clang500-import/   (props changed)
  projects/clang500-import/cddl/   (props changed)
  projects/clang500-import/cddl/contrib/opensolaris/   (props changed)
  projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/clang500-import/contrib/elftoolchain/   (props changed)
  projects/clang500-import/contrib/less/   (props changed)
  projects/clang500-import/contrib/llvm/   (props changed)
  projects/clang500-import/contrib/netbsd-tests/   (props changed)
  projects/clang500-import/contrib/tcpdump/   (props changed)
  projects/clang500-import/gnu/usr.bin/gdb/   (props changed)
  projects/clang500-import/sys/cddl/contrib/opensolaris/   (props changed)

Modified: projects/clang500-import/ObsoleteFiles.inc
==============================================================================
--- projects/clang500-import/ObsoleteFiles.inc	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/ObsoleteFiles.inc	Thu Apr 27 12:59:14 2017	(r317503)
@@ -150,6 +150,50 @@ OLD_FILES+=usr/lib/clang/4.0.0/lib/freeb
 OLD_DIRS+=usr/lib/clang/4.0.0/lib/freebsd
 OLD_DIRS+=usr/lib/clang/4.0.0/lib
 OLD_DIRS+=usr/lib/clang/4.0.0
+# 20170426: Remove cy(4)
+OLD_FILES+=usr/share/man/man4/cy.4.gz
+# 20170425: NATM configuration support removed
+OLD_FILES+=etc/rc.d/atm1
+OLD_FILES+=etc/rc.d/atm2
+OLD_FILES+=etc/rc.d/atm3
+# 20170424: NATM support removed
+OLD_FILES+=rescue/atmconfig
+OLD_FILES+=sbin/atmconfig
+OLD_FILES+=usr/include/bsnmp/snmp_atm.h
+OLD_FILES+=usr/include/dev/utopia/idtphy.h
+OLD_FILES+=usr/include/dev/utopia/suni.h
+OLD_FILES+=usr/include/dev/utopia/utopia.h
+OLD_FILES+=usr/include/dev/utopia/utopia_priv.h
+OLD_DIRS+=usr/include/dev/utopia
+OLD_FILES+=usr/include/net/if_atm.h
+OLD_FILES+=usr/include/netgraph/atm/ng_atm.h
+OLD_FILES+=usr/include/netinet/if_atm.h
+OLD_FILES+=usr/include/netnatm/natm.h
+OLD_FILES+=usr/lib/debug/sbin/atmconfig.debug
+OLD_FILES+=usr/lib/debug/usr/lib/snmp_atm.so.6.debug
+OLD_FILES+=usr/lib/snmp_atm.so
+OLD_FILES+=usr/lib/snmp_atm.so.6
+OLD_FILES+=usr/share/doc/atm/atmconfig.help
+OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
+OLD_DIRS+=usr/share/doc/atm
+OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
+OLD_FILES+=usr/share/man/man4/en.4.gz
+OLD_FILES+=usr/share/man/man4/fatm.4.gz
+OLD_FILES+=usr/share/man/man4/hatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_en.4.gz
+OLD_FILES+=usr/share/man/man4/if_fatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_hatm.4.gz
+OLD_FILES+=usr/share/man/man4/if_patm.4.gz
+OLD_FILES+=usr/share/man/man4/natm.4.gz
+OLD_FILES+=usr/share/man/man4/natmip.4.gz
+OLD_FILES+=usr/share/man/man4/ng_atm.4.gz
+OLD_FILES+=usr/share/man/man4/patm.4.gz
+OLD_FILES+=usr/share/man/man4/utopia.4.gz
+OLD_FILES+=usr/share/man/man8/atmconfig.8.gz
+OLD_FILES+=usr/share/snmp/defs/atm_freebsd.def
+OLD_FILES+=usr/share/snmp/defs/atm_tree.def
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM-FREEBSD-MIB.txt
+OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-ATM.txt
 # 20170420: remove GNU diff
 OLD_FILES+=usr/share/man/man7/diff.7.gz
 # 20170322: rename <x> to <x>_test to match the FreeBSD test suite name scheme
@@ -2176,8 +2220,12 @@ OLD_FILES+=usr/share/info/am-utils.info.
 OLD_FILES+=usr/share/info/as.info.gz
 OLD_FILES+=usr/share/info/binutils.info.gz
 OLD_FILES+=usr/share/info/com_err.info.gz
+OLD_FILES+=usr/share/info/cpp.info.gz
+OLD_FILES+=usr/share/info/cppinternals.info.gz
 OLD_FILES+=usr/share/info/diff.info.gz
 OLD_FILES+=usr/share/info/dir
+OLD_FILES+=usr/share/info/gcc.info.gz
+OLD_FILES+=usr/share/info/gccint.info.gz
 OLD_FILES+=usr/share/info/gdb.info.gz
 OLD_FILES+=usr/share/info/gdbint.info.gz
 OLD_FILES+=usr/share/info/gperf.info.gz

Modified: projects/clang500-import/UPDATING
==============================================================================
--- projects/clang500-import/UPDATING	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/UPDATING	Thu Apr 27 12:59:14 2017	(r317503)
@@ -56,6 +56,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	Please see the 20141231 entry below for information about prerequisites
 	and upgrading, if you are not already using clang 3.5.0 or higher.
 
+20170424:
+	The NATM framework including the en(4), fatm(4), hatm(4), and
+	patm(4) devices has been removed.  Consumers should plan a
+	migration before the end-of-life date for FreeBSD 11.
+
 20170420:
 	GNU diff has been replaced by a BSD licensed diff. Some features of GNU
 	diff has not been implemented, if those are needed a newer version of
@@ -76,6 +81,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12
 	installed. To continue using aarch64-binutils, set
 	CROSS_BINUTILS_PREFIX=/usr/local/aarch64-freebsd/bin .
 
+20170405:
+	The UDP optimization in entry 20160818 that added the sysctl
+	net.inet.udp.require_l2_bcast has been reverted.  L2 broadcast
+	packets will no longer be treated as L3 broadcast packets.
+
 20170331:
 	Binds and sends to the loopback addresses, IPv6 and IPv4, will now
 	use any explicitly assigned loopback address available in the jail

Modified: projects/clang500-import/bin/sh/options.c
==============================================================================
--- projects/clang500-import/bin/sh/options.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/bin/sh/options.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -131,7 +131,7 @@ procargs(int argc, char **argv)
 void
 optschanged(void)
 {
-	setinteractive(iflag);
+	setinteractive();
 #ifndef NO_HISTORY
 	histedit();
 #endif

Modified: projects/clang500-import/bin/sh/tests/expansion/Makefile
==============================================================================
--- projects/clang500-import/bin/sh/tests/expansion/Makefile	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/bin/sh/tests/expansion/Makefile	Thu Apr 27 12:59:14 2017	(r317503)
@@ -45,6 +45,7 @@ ${PACKAGE}FILES+=	cmdsubst20.0
 ${PACKAGE}FILES+=	cmdsubst21.0
 ${PACKAGE}FILES+=	cmdsubst22.0
 ${PACKAGE}FILES+=	cmdsubst23.0
+${PACKAGE}FILES+=	cmdsubst24.0
 ${PACKAGE}FILES+=	export1.0
 ${PACKAGE}FILES+=	export2.0
 ${PACKAGE}FILES+=	export3.0

Copied: projects/clang500-import/bin/sh/tests/expansion/cmdsubst24.0 (from r317502, head/bin/sh/tests/expansion/cmdsubst24.0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/clang500-import/bin/sh/tests/expansion/cmdsubst24.0	Thu Apr 27 12:59:14 2017	(r317503, copy of r317502, head/bin/sh/tests/expansion/cmdsubst24.0)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+# POSIX leaves the effect of NUL bytes in command substitution output
+# unspecified but we have always discarded them.
+
+failures=0
+
+check() {
+	if [ "$2" != "$3" ]; then
+		printf "Failed at line %s: got \"%s\" expected \"%s\"\n" "$1" "$2" "$3"
+		: $((failures += 1))
+	fi
+}
+
+fmt='\0a\0 \0b\0c d\0'
+assign_builtin=$(printf "$fmt")
+check "$LINENO" "$assign_builtin" "a bc d"
+assign_pipeline=$(printf "$fmt" | cat)
+check "$LINENO" "$assign_pipeline" "a bc d"
+set -- $(printf "$fmt") $(printf "$fmt" | cat) "$(printf "$fmt")" "$(printf "$fmt" | cat)" 
+IFS=@
+splits="$*"
+check "$LINENO" "$splits" "a@bc@d@a@bc@d@a bc d@a bc d"
+
+[ "$failures" = 0 ]

Modified: projects/clang500-import/bin/sh/trap.c
==============================================================================
--- projects/clang500-import/bin/sh/trap.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/bin/sh/trap.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -478,19 +478,14 @@ dotrap(void)
 
 
 /*
- * Controls whether the shell is interactive or not.
+ * Controls whether the shell is interactive or not based on iflag.
  */
 void
-setinteractive(int on)
+setinteractive(void)
 {
-	static int is_interactive = -1;
-
-	if (on == is_interactive)
-		return;
 	setsignal(SIGINT);
 	setsignal(SIGQUIT);
 	setsignal(SIGTERM);
-	is_interactive = on;
 }
 
 

Modified: projects/clang500-import/bin/sh/trap.h
==============================================================================
--- projects/clang500-import/bin/sh/trap.h	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/bin/sh/trap.h	Thu Apr 27 12:59:14 2017	(r317503)
@@ -43,6 +43,6 @@ void ignoresig(int);
 int issigchldtrapped(void);
 void onsig(int);
 void dotrap(void);
-void setinteractive(int);
+void setinteractive(void);
 void exitshell(int) __dead2;
 void exitshell_savedstatus(void) __dead2;

Modified: projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs.8	Thu Apr 27 12:59:14 2017	(r317503)
@@ -180,12 +180,12 @@
 .Ar bookmark
 .Nm
 .Cm send
-.Op Fl DnPpRveL
+.Op Fl DLPRcenpv
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
 .Cm send
-.Op Fl eL
+.Op Fl Lce
 .Op Fl i Ar snapshot Ns | Ns bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
@@ -2535,7 +2535,7 @@ feature.
 .It Xo
 .Nm
 .Cm send
-.Op Fl DnPpRveL
+.Op Fl DLPRcenpv
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Xc
@@ -2580,7 +2580,7 @@ The incremental
 source may be specified as with the
 .Fl i
 option.
-.It Fl R
+.It Fl R, -replicate
 Generate a replication stream package, which will replicate the specified
 filesystem, and all descendent file systems, up to the named snapshot. When
 received, all properties, snapshots, descendent file systems, and clones are
@@ -2598,7 +2598,7 @@ is received. If the
 .Fl F
 flag is specified when this stream is received, snapshots and file systems that
 do not exist on the sending side are destroyed.
-.It Fl D
+.It Fl D, -dedup
 Generate a deduplicated stream. Blocks which would have been sent multiple
 times in the send stream will only be sent once.  The receiving system must
 also support this feature to receive a deduplicated stream.  This flag can
@@ -2607,7 +2607,7 @@ be used regardless of the dataset's
 property, but performance will be much better if the filesystem uses a
 dedup-capable checksum (eg.
 .Sy sha256 ) .
-.It Fl L
+.It Fl L, -large-block
 Generate a stream which may contain blocks larger than 128KB.
 This flag
 has no effect if the
@@ -2623,7 +2623,7 @@ See
 for details on ZFS feature flags and the
 .Sy large_blocks
 feature.
-.It Fl e
+.It Fl e, -embed
 Generate a more compact stream by using WRITE_EMBEDDED records for blocks
 which are stored more compactly on disk by the
 .Sy embedded_data
@@ -2646,11 +2646,25 @@ See
 for details on ZFS feature flags and the
 .Sy embedded_data
 feature.
-.It Fl p
+.It Fl c, -compressed
+Generate a more compact stream by using compressed WRITE records for blocks
+which are compressed on disk and in memory (see the
+.Sy compression property for details).  If the
+.Sy lz4_compress
+feature is active on the sending system, then the receiving system must have that
+feature enabled as well. If the
+.Sy large_blocks
+feature is enabled on the sending system but the
+.Fl L
+option is not supplied in conjunction with
+.Fl c
+then the data will be decompressed before sending so it can be split
+into smaller block sizes.
+.It Fl p, -props
 Include the dataset's properties in the stream. This flag is implicit when
 .Fl R
 is specified. The receiving system must also support this feature.
-.It Fl n
+.It Fl n, -dryrun
 Do a dry-run ("No-op") send.  Do not generate any actual send data.  This is
 useful in conjunction with the
 .Fl v
@@ -2660,9 +2674,9 @@ flags to determine what data will be sen
 In this case, the verbose output will be written to
 standard output (contrast with a non-dry-run, where the stream is written
 to standard output and the verbose output goes to standard error).
-.It Fl P
+.It Fl P, -parsable
 Print machine-parsable verbose information about the stream package generated.
-.It Fl v
+.It Fl v, -verbose
 Print verbose information about the stream package generated.
 This information includes a per-second report of how much data has been sent.
 .El
@@ -2673,7 +2687,7 @@ on future versions of
 .It Xo
 .Nm
 .Cm send
-.Op Fl eL
+.Op Fl Lce
 .Op Fl i Ar snapshot Ns | Ns Ar bookmark
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
@@ -2699,7 +2713,7 @@ specified as the last component of the n
 If the incremental target is a clone, the incremental source can
 be the origin snapshot, or an earlier snapshot in the origin's filesystem,
 or the origin's origin, etc.
-.It Fl L
+.It Fl L, -large-block
 Generate a stream which may contain blocks larger than 128KB.
 This flag
 has no effect if the
@@ -2715,7 +2729,22 @@ See
 for details on ZFS feature flags and the
 .Sy large_blocks
 feature.
-.It Fl e
+.It Fl c, -compressed
+Generate a more compact stream by using compressed WRITE records for blocks
+which are compressed on disk and in memory (see the
+.Sy compression
+property for details).  If the
+.Sy lz4_compress
+feature is active on the sending system, then the receiving system must have
+that feature enabled as well. If the
+.Sy large_blocks
+feature is enabled on the sending system but the
+.Fl L
+option is not supplied in conjunction with
+.Fl c
+then the data will be decompressed before sending so it can be split
+into smaller block sizes.
+.It Fl e, -embed
 Generate a more compact stream by using WRITE_EMBEDDED records for blocks
 which are stored more compactly on disk by the
 .Sy embedded_data

Modified: projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -35,6 +35,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
+#include <getopt.h>
 #include <libgen.h>
 #include <libintl.h>
 #include <libuutil.h>
@@ -278,7 +279,7 @@ get_usage(zfs_help_t idx)
 	case HELP_ROLLBACK:
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
 	case HELP_SEND:
-		return (gettext("\tsend [-DnPpRvLe] [-[iI] snapshot] "
+		return (gettext("\tsend [-DnPpRvLec] [-[iI] snapshot] "
 		    "<snapshot>\n"
 		    "\tsend [-Le] [-i snapshot|bookmark] "
 		    "<filesystem|volume|snapshot>\n"
@@ -3771,8 +3772,23 @@ zfs_do_send(int argc, char **argv)
 	nvlist_t *dbgnv = NULL;
 	boolean_t extraverbose = B_FALSE;
 
+	struct option long_options[] = {
+		{"replicate",	no_argument,		NULL, 'R'},
+		{"props",	no_argument,		NULL, 'p'},
+		{"parsable",	no_argument,		NULL, 'P'},
+		{"dedup",	no_argument,		NULL, 'D'},
+		{"verbose",	no_argument,		NULL, 'v'},
+		{"dryrun",	no_argument,		NULL, 'n'},
+		{"large-block",	no_argument,		NULL, 'L'},
+		{"embed",	no_argument,		NULL, 'e'},
+		{"resume",	required_argument,	NULL, 't'},
+		{"compressed",	no_argument,		NULL, 'c'},
+		{0, 0, 0, 0}
+	};
+
 	/* check options */
-	while ((c = getopt(argc, argv, ":i:I:RDpvnPLet:")) != -1) {
+	while ((c = getopt_long(argc, argv, ":i:I:RbDpvnPLet:c", long_options,
+	    NULL)) != -1) {
 		switch (c) {
 		case 'i':
 			if (fromname)
@@ -3816,12 +3832,17 @@ zfs_do_send(int argc, char **argv)
 		case 't':
 			resume_token = optarg;
 			break;
+		case 'c':
+			flags.compress = B_TRUE;
+			break;
 		case ':':
 			(void) fprintf(stderr, gettext("missing argument for "
 			    "'%c' option\n"), optopt);
 			usage(B_FALSE);
 			break;
 		case '?':
+			/*FALLTHROUGH*/
+		default:
 			(void) fprintf(stderr, gettext("invalid option '%c'\n"),
 			    optopt);
 			usage(B_FALSE);
@@ -3892,6 +3913,8 @@ zfs_do_send(int argc, char **argv)
 			lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK;
 		if (flags.embed_data)
 			lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
+		if (flags.compress)
+			lzc_flags |= LZC_SEND_FLAG_COMPRESS;
 
 		if (fromname != NULL &&
 		    (fromname[0] == '#' || fromname[0] == '@')) {

Modified: projects/clang500-import/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -25,8 +25,8 @@
  */
 
 /*
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 #include <ctype.h>
@@ -39,6 +39,7 @@
 
 #include <sys/dmu.h>
 #include <sys/zfs_ioctl.h>
+#include <sys/zio.h>
 #include <zfs_fletcher.h>
 
 /*
@@ -251,6 +252,7 @@ main(int argc, char *argv[])
 			(void) fprintf(stderr, "invalid option '%c'\n",
 			    optopt);
 			usage();
+			break;
 		}
 	}
 
@@ -453,38 +455,50 @@ main(int argc, char *argv[])
 				drrw->drr_object = BSWAP_64(drrw->drr_object);
 				drrw->drr_type = BSWAP_32(drrw->drr_type);
 				drrw->drr_offset = BSWAP_64(drrw->drr_offset);
-				drrw->drr_length = BSWAP_64(drrw->drr_length);
+				drrw->drr_logical_size =
+				    BSWAP_64(drrw->drr_logical_size);
 				drrw->drr_toguid = BSWAP_64(drrw->drr_toguid);
 				drrw->drr_key.ddk_prop =
 				    BSWAP_64(drrw->drr_key.ddk_prop);
+				drrw->drr_compressed_size =
+				    BSWAP_64(drrw->drr_compressed_size);
 			}
+
+			uint64_t payload_size = DRR_WRITE_PAYLOAD_SIZE(drrw);
+
 			/*
 			 * If this is verbose and/or dump output,
 			 * print info on the modified block
 			 */
 			if (verbose) {
 				(void) printf("WRITE object = %llu type = %u "
-				    "checksum type = %u\n"
-				    "    offset = %llu length = %llu "
+				    "checksum type = %u compression type = %u\n"
+				    "    offset = %llu logical_size = %llu "
+				    "compressed_size = %llu "
+				    "payload_size = %llu "
 				    "props = %llx\n",
 				    (u_longlong_t)drrw->drr_object,
 				    drrw->drr_type,
 				    drrw->drr_checksumtype,
+				    drrw->drr_compressiontype,
 				    (u_longlong_t)drrw->drr_offset,
-				    (u_longlong_t)drrw->drr_length,
+				    (u_longlong_t)drrw->drr_logical_size,
+				    (u_longlong_t)drrw->drr_compressed_size,
+				    (u_longlong_t)payload_size,
 				    (u_longlong_t)drrw->drr_key.ddk_prop);
 			}
+
 			/*
 			 * Read the contents of the block in from STDIN to buf
 			 */
-			(void) ssread(buf, drrw->drr_length, &zc);
+			(void) ssread(buf, payload_size, &zc);
 			/*
 			 * If in dump mode
 			 */
 			if (dump) {
-				print_block(buf, drrw->drr_length);
+				print_block(buf, payload_size);
 			}
-			total_write_size += drrw->drr_length;
+			total_write_size += payload_size;
 			break;
 
 		case DRR_WRITE_BYREF:

Modified: projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h	Thu Apr 27 12:59:14 2017	(r317503)
@@ -616,6 +616,9 @@ typedef struct sendflags {
 
 	/* WRITE_EMBEDDED records of type DATA are permitted */
 	boolean_t embed_data;
+
+	/* compressed WRITE records are permitted */
+	boolean_t compress;
 } sendflags_t;
 
 typedef boolean_t (snapfilter_cb_t)(zfs_handle_t *, void *);

Modified: projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -354,8 +354,10 @@ cksummer(void *arg)
 		{
 			struct drr_write *drrw = &drr->drr_u.drr_write;
 			dataref_t	dataref;
+			uint64_t	payload_size;
 
-			(void) ssread(buf, drrw->drr_length, ofp);
+			payload_size = DRR_WRITE_PAYLOAD_SIZE(drrw);
+			(void) ssread(buf, payload_size, ofp);
 
 			/*
 			 * Use the existing checksum if it's dedup-capable,
@@ -369,7 +371,7 @@ cksummer(void *arg)
 				zio_cksum_t	tmpsha256;
 
 				SHA256Init(&ctx);
-				SHA256Update(&ctx, buf, drrw->drr_length);
+				SHA256Update(&ctx, buf, payload_size);
 				SHA256Final(&tmpsha256, &ctx);
 				drrw->drr_key.ddk_cksum.zc_word[0] =
 				    BE_64(tmpsha256.zc_word[0]);
@@ -399,7 +401,7 @@ cksummer(void *arg)
 
 				wbr_drrr->drr_object = drrw->drr_object;
 				wbr_drrr->drr_offset = drrw->drr_offset;
-				wbr_drrr->drr_length = drrw->drr_length;
+				wbr_drrr->drr_length = drrw->drr_logical_size;
 				wbr_drrr->drr_toguid = drrw->drr_toguid;
 				wbr_drrr->drr_refguid = dataref.ref_guid;
 				wbr_drrr->drr_refobject =
@@ -421,7 +423,7 @@ cksummer(void *arg)
 					goto out;
 			} else {
 				/* block not previously seen */
-				if (dump_record(drr, buf, drrw->drr_length,
+				if (dump_record(drr, buf, payload_size,
 				    &stream_cksum, outfd) != 0)
 					goto out;
 			}
@@ -924,7 +926,7 @@ typedef struct send_dump_data {
 	uint64_t prevsnap_obj;
 	boolean_t seenfrom, seento, replicate, doall, fromorigin;
 	boolean_t verbose, dryrun, parsable, progress, embed_data, std_out;
-	boolean_t large_block;
+	boolean_t large_block, compress;
 	int outfd;
 	boolean_t err;
 	nvlist_t *fss;
@@ -940,7 +942,7 @@ typedef struct send_dump_data {
 
 static int
 estimate_ioctl(zfs_handle_t *zhp, uint64_t fromsnap_obj,
-    boolean_t fromorigin, uint64_t *sizep)
+    boolean_t fromorigin, enum lzc_send_flags flags, uint64_t *sizep)
 {
 	zfs_cmd_t zc = { 0 };
 	libzfs_handle_t *hdl = zhp->zfs_hdl;
@@ -953,6 +955,7 @@ estimate_ioctl(zfs_handle_t *zhp, uint64
 	zc.zc_sendobj = zfs_prop_get_int(zhp, ZFS_PROP_OBJSETID);
 	zc.zc_fromobj = fromsnap_obj;
 	zc.zc_guid = 1;  /* estimate flag */
+	zc.zc_flags = flags;
 
 	if (zfs_ioctl(zhp->zfs_hdl, ZFS_IOC_SEND, &zc) != 0) {
 		char errbuf[1024];
@@ -1192,6 +1195,7 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 	progress_arg_t pa = { 0 };
 	pthread_t tid;
 	char *thissnap;
+	enum lzc_send_flags flags = 0;
 	int err;
 	boolean_t isfromsnap, istosnap, fromorigin;
 	boolean_t exclude = B_FALSE;
@@ -1220,6 +1224,13 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 	if (istosnap)
 		sdd->seento = B_TRUE;
 
+	if (sdd->large_block)
+		flags |= LZC_SEND_FLAG_LARGE_BLOCK;
+	if (sdd->embed_data)
+		flags |= LZC_SEND_FLAG_EMBED_DATA;
+	if (sdd->compress)
+		flags |= LZC_SEND_FLAG_COMPRESS;
+
 	if (!sdd->doall && !isfromsnap && !istosnap) {
 		if (sdd->replicate) {
 			char *snapname;
@@ -1266,7 +1277,7 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 	if (sdd->verbose) {
 		uint64_t size = 0;
 		(void) estimate_ioctl(zhp, sdd->prevsnap_obj,
-		    fromorigin, &size);
+		    fromorigin, flags, &size);
 
 		send_print_verbose(fout, zhp->zfs_name,
 		    sdd->prevsnap[0] ? sdd->prevsnap : NULL,
@@ -1291,12 +1302,6 @@ dump_snapshot(zfs_handle_t *zhp, void *a
 			}
 		}
 
-		enum lzc_send_flags flags = 0;
-		if (sdd->large_block)
-			flags |= LZC_SEND_FLAG_LARGE_BLOCK;
-		if (sdd->embed_data)
-			flags |= LZC_SEND_FLAG_EMBED_DATA;
-
 		err = dump_ioctl(zhp, sdd->prevsnap, sdd->prevsnap_obj,
 		    fromorigin, sdd->outfd, flags, sdd->debugnv);
 
@@ -1602,8 +1607,12 @@ zfs_send_resume(libzfs_handle_t *hdl, se
 	fromguid = 0;
 	(void) nvlist_lookup_uint64(resume_nvl, "fromguid", &fromguid);
 
+	if (flags->largeblock || nvlist_exists(resume_nvl, "largeblockok"))
+		lzc_flags |= LZC_SEND_FLAG_LARGE_BLOCK;
 	if (flags->embed_data || nvlist_exists(resume_nvl, "embedok"))
 		lzc_flags |= LZC_SEND_FLAG_EMBED_DATA;
+	if (flags->compress || nvlist_exists(resume_nvl, "compressok"))
+		lzc_flags |= LZC_SEND_FLAG_COMPRESS;
 
 	if (guid_to_name(hdl, toname, toguid, B_FALSE, name) != 0) {
 		if (zfs_dataset_exists(hdl, toname, ZFS_TYPE_DATASET)) {
@@ -1636,7 +1645,8 @@ zfs_send_resume(libzfs_handle_t *hdl, se
 
 	if (flags->verbose) {
 		uint64_t size = 0;
-		error = lzc_send_space(zhp->zfs_name, fromname, &size);
+		error = lzc_send_space(zhp->zfs_name, fromname,
+		    lzc_flags, &size);
 		if (error == 0)
 			size = MAX(0, (int64_t)(size - bytes));
 		send_print_verbose(stderr, zhp->zfs_name, fromname,
@@ -1866,6 +1876,7 @@ zfs_send(zfs_handle_t *zhp, const char *
 	sdd.dryrun = flags->dryrun;
 	sdd.large_block = flags->largeblock;
 	sdd.embed_data = flags->embed_data;
+	sdd.compress = flags->compress;
 	sdd.filter_cb = filter_func;
 	sdd.filter_cb_arg = cb_arg;
 	if (debugnvp)
@@ -2960,11 +2971,17 @@ recv_skip(libzfs_handle_t *hdl, int fd, 
 
 		case DRR_WRITE:
 			if (byteswap) {
-				drr->drr_u.drr_write.drr_length =
-				    BSWAP_64(drr->drr_u.drr_write.drr_length);
+				drr->drr_u.drr_write.drr_logical_size =
+				    BSWAP_64(
+				    drr->drr_u.drr_write.drr_logical_size);
+				drr->drr_u.drr_write.drr_compressed_size =
+				    BSWAP_64(
+				    drr->drr_u.drr_write.drr_compressed_size);
 			}
+			uint64_t payload_size =
+			    DRR_WRITE_PAYLOAD_SIZE(&drr->drr_u.drr_write);
 			(void) recv_read(hdl, fd, buf,
-			    drr->drr_u.drr_write.drr_length, B_FALSE, NULL);
+			    payload_size, B_FALSE, NULL);
 			break;
 		case DRR_SPILL:
 			if (byteswap) {

Modified: projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -534,6 +534,8 @@ lzc_send_resume(const char *snapname, co
 		fnvlist_add_boolean(args, "largeblockok");
 	if (flags & LZC_SEND_FLAG_EMBED_DATA)
 		fnvlist_add_boolean(args, "embedok");
+	if (flags & LZC_SEND_FLAG_COMPRESS)
+		fnvlist_add_boolean(args, "compressok");
 	if (resumeobj != 0 || resumeoff != 0) {
 		fnvlist_add_uint64(args, "resume_object", resumeobj);
 		fnvlist_add_uint64(args, "resume_offset", resumeoff);
@@ -559,7 +561,8 @@ lzc_send_resume(const char *snapname, co
  * an equivalent snapshot.
  */
 int
-lzc_send_space(const char *snapname, const char *from, uint64_t *spacep)
+lzc_send_space(const char *snapname, const char *from,
+    enum lzc_send_flags flags, uint64_t *spacep)
 {
 	nvlist_t *args;
 	nvlist_t *result;
@@ -568,6 +571,12 @@ lzc_send_space(const char *snapname, con
 	args = fnvlist_alloc();
 	if (from != NULL)
 		fnvlist_add_string(args, "from", from);
+	if (flags & LZC_SEND_FLAG_LARGE_BLOCK)
+		fnvlist_add_boolean(args, "largeblockok");
+	if (flags & LZC_SEND_FLAG_EMBED_DATA)
+		fnvlist_add_boolean(args, "embedok");
+	if (flags & LZC_SEND_FLAG_COMPRESS)
+		fnvlist_add_boolean(args, "compressok");
 	err = lzc_ioctl(ZFS_IOC_SEND_SPACE, snapname, args, &result);
 	nvlist_free(args);
 	if (err == 0)

Modified: projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h
==============================================================================
--- projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.h	Thu Apr 27 12:59:14 2017	(r317503)
@@ -62,13 +62,14 @@ int lzc_get_holds(const char *, nvlist_t
 
 enum lzc_send_flags {
 	LZC_SEND_FLAG_EMBED_DATA = 1 << 0,
-	LZC_SEND_FLAG_LARGE_BLOCK = 1 << 1
+	LZC_SEND_FLAG_LARGE_BLOCK = 1 << 1,
+	LZC_SEND_FLAG_COMPRESS = 1 << 2
 };
 
 int lzc_send(const char *, const char *, int, enum lzc_send_flags);
 int lzc_send_resume(const char *, const char *, int,
     enum lzc_send_flags, uint64_t, uint64_t);
-int lzc_send_space(const char *, const char *, uint64_t *);
+int lzc_send_space(const char *, const char *, enum lzc_send_flags, uint64_t *);
 
 struct dmu_replay_record;
 

Modified: projects/clang500-import/contrib/elftoolchain/elfcopy/main.c
==============================================================================
--- projects/clang500-import/contrib/elftoolchain/elfcopy/main.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/contrib/elftoolchain/elfcopy/main.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -1285,8 +1285,9 @@ parse_symlist_file(struct elfcopy *ecp, 
 		err(EXIT_FAILURE, "can not open %s", fn);
 	if ((data = malloc(sb.st_size + 1)) == NULL)
 		err(EXIT_FAILURE, "malloc failed");
-	if (fread(data, 1, sb.st_size, fp) == 0 || ferror(fp))
-		err(EXIT_FAILURE, "fread failed");
+	if (sb.st_size > 0)
+		if (fread(data, sb.st_size, 1, fp) != 1)
+			err(EXIT_FAILURE, "fread failed");
 	fclose(fp);
 	data[sb.st_size] = '\0';
 

Modified: projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh
==============================================================================
--- projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/contrib/netbsd-tests/usr.bin/grep/t_grep.sh	Thu Apr 27 12:59:14 2017	(r317503)
@@ -159,12 +159,6 @@ context_head()
 }
 context_body()
 {
-	# Begin FreeBSD
-	grep_type
-	if [ $? -eq $GREP_TYPE_BSD ]; then
-		atf_expect_fail "this test doesn't pass with BSD grep yet"
-	fi
-	# End FreeBSD
 	cp $(atf_get_srcdir)/d_context_*.* .
 
 	atf_check -o file:d_context_a.out grep -C2 bamboo d_context_a.in
@@ -226,12 +220,6 @@ context2_head()
 }
 context2_body()
 {
-	# Begin FreeBSD
-	grep_type
-	if [ $? -eq $GREP_TYPE_BSD ]; then
-		atf_expect_fail "this test doesn't pass with BSD grep yet"
-	fi
-	# End FreeBSD
 	printf "haddock\000cod\000plaice\000" > test1
 	printf "mackeral\000cod\000crab\000" > test2
 
@@ -391,6 +379,66 @@ zerolen_body()
 
 	atf_check -o inline:"Eggs\nCheese\n" grep -v -e "^$" test1
 }
+
+atf_test_case fgrep_sanity
+fgrep_sanity_head()
+{
+	atf_set "descr" "Check for fgrep sanity, literal expressions only"
+}
+fgrep_sanity_body()
+{
+	printf "Foo" > test1
+
+	atf_check -o inline:"Foo\n" fgrep -e "Foo" test1
+
+	atf_check -s exit:1 -o empty fgrep -e "Fo." test1
+}
+
+atf_test_case egrep_sanity
+egrep_sanity_head()
+{
+	atf_set "descr" "Check for egrep sanity, EREs only"
+}
+egrep_sanity_body()
+{
+	printf "Foobar(ed)" > test1
+	printf "M{1}" > test2
+
+	atf_check -o inline:"Foo\n" egrep -o -e "F.." test1
+
+	atf_check -o inline:"Foobar\n" egrep -o -e "F[a-z]*" test1
+
+	atf_check -o inline:"Fo\n" egrep -o -e "F(o|p)" test1
+
+	atf_check -o inline:"(ed)\n" egrep -o -e "\(ed\)" test1
+
+	atf_check -o inline:"M\n" egrep -o -e "M{1}" test2
+
+	atf_check -o inline:"M{1}\n" egrep -o -e "M\{1\}" test2
+}
+
+atf_test_case grep_sanity
+grep_sanity_head()
+{
+	atf_set "descr" "Check for basic grep sanity, BREs only"
+}
+grep_sanity_body()
+{
+	printf "Foobar(ed)" > test1
+	printf "M{1}" > test2
+
+	atf_check -o inline:"Foo\n" grep -o -e "F.." test1
+
+	atf_check -o inline:"Foobar\n" grep -o -e "F[a-z]*" test1
+
+	atf_check -o inline:"Fo\n" grep -o -e "F\(o\)" test1
+
+	atf_check -o inline:"(ed)\n" grep -o -e "(ed)" test1
+
+	atf_check -o inline:"M{1}\n" grep -o -e "M{1}" test2
+
+	atf_check -o inline:"M\n" grep -o -e "M\{1\}" test2
+}
 # End FreeBSD
 
 atf_init_test_cases()
@@ -419,5 +467,8 @@ atf_init_test_cases()
 	atf_add_test_case escmap
 	atf_add_test_case egrep_empty_invalid
 	atf_add_test_case zerolen
+	atf_add_test_case fgrep_sanity
+	atf_add_test_case egrep_sanity
+	atf_add_test_case grep_sanity
 # End FreeBSD
 }

Modified: projects/clang500-import/contrib/tcpdump/tcpdump.c
==============================================================================
--- projects/clang500-import/contrib/tcpdump/tcpdump.c	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/contrib/tcpdump/tcpdump.c	Thu Apr 27 12:59:14 2017	(r317503)
@@ -1085,9 +1085,9 @@ open_interface(const char *device, netdi
 			/*
 			 * Return an error for our caller to handle.
 			 */
-			pcap_close(pc);
 			snprintf(ebuf, PCAP_ERRBUF_SIZE, "%s: %s\n(%s)",
 			    device, pcap_statustostr(status), cp);
+			pcap_close(pc);
 			return (NULL);
 		} else if (status == PCAP_ERROR_PERM_DENIED && *cp != '\0')
 			error("%s: %s\n(%s)", device,

Modified: projects/clang500-import/etc/defaults/rc.conf
==============================================================================
--- projects/clang500-import/etc/defaults/rc.conf	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/defaults/rc.conf	Thu Apr 27 12:59:14 2017	(r317503)
@@ -408,7 +408,6 @@ defaultrouter="NO"		# Set to default gat
 static_arp_pairs=""		# Set to static ARP list (or leave empty).
 static_ndp_pairs=""		# Set to static NDP list (or leave empty).
 static_routes=""		# Set to static route list (or leave empty).
-natm_static_routes=""		# Set to static route list for NATM (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.
 routed_enable="NO"		# Set to YES to enable a routing daemon.
 routed_program="/sbin/routed"	# Name of routing daemon to use if enabled.
@@ -417,17 +416,6 @@ arpproxy_all="NO"		# replaces obsolete k
 forward_sourceroute="NO"	# do source routing (only if gateway_enable is set to "YES")
 accept_sourceroute="NO"		# accept source routed packets to us
 
-### ATM interface options: ###
-atm_enable="NO"			# Configure ATM interfaces (or NO).
-#atm_netif_hea0="atm 1"		# Network interfaces for physical interface.
-#atm_sigmgr_hea0="uni31"	# Signalling manager for physical interface.
-#atm_prefix_hea0="ILMI"		# NSAP prefix (UNI interfaces only) (or ILMI).
-#atm_macaddr_hea0="NO"		# Override physical MAC address (or NO).
-#atm_arpserver_atm0="0x47.0005.80.999999.9999.9999.9999.999999999999.00" # ATMARP server address (or local).
-#atm_scsparp_atm0="NO"		# Run SCSP/ATMARP on network interface (or NO).
-atm_pvcs=""			# Set to PVC list (or leave empty).
-atm_arps=""			# Set to permanent ARP list (or leave empty).
-
 ### Bluetooth ###
 hcsecd_enable="NO"		# Enable hcsecd(8) (or NO)
 hcsecd_config="/etc/bluetooth/hcsecd.conf" # hcsecd(8) configuration file

Modified: projects/clang500-import/etc/mtree/BSD.usr.dist
==============================================================================
--- projects/clang500-import/etc/mtree/BSD.usr.dist	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/mtree/BSD.usr.dist	Thu Apr 27 12:59:14 2017	(r317503)
@@ -189,8 +189,6 @@
             ..
             atf
             ..
-            atm
-            ..
             legal
             ..
             llvm

Modified: projects/clang500-import/etc/netstart
==============================================================================
--- projects/clang500-import/etc/netstart	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/netstart	Thu Apr 27 12:59:14 2017	(r317503)
@@ -44,9 +44,6 @@ _start=quietstart
 /etc/rc.d/ipnat ${_start}
 /etc/rc.d/ipfs ${_start}
 /etc/rc.d/sppp ${_start}
-# /etc/rc.d/atm1 ${_start}
-# . /etc/rc.d/atm2.sh ${_start}
-# . /etc/rc.d/atm3.sh ${_start}
 /etc/rc.d/netif ${_start}
 /etc/rc.d/ipsec ${_start}
 /etc/rc.d/ppp ${_start}

Modified: projects/clang500-import/etc/network.subr
==============================================================================
--- projects/clang500-import/etc/network.subr	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/network.subr	Thu Apr 27 12:59:14 2017	(r317503)
@@ -489,13 +489,6 @@ afexists()
 	inet|inet6)
 		check_kern_features ${_af}
 		;;
-	atm)
-		if [ -x /sbin/atmconfig ]; then
-			/sbin/atmconfig diag list > /dev/null 2>&1
-		else
-			return 1
-		fi
-		;;
 	link|ether)
 		return 0
 		;;

Modified: projects/clang500-import/etc/rc.d/Makefile
==============================================================================
--- projects/clang500-import/etc/rc.d/Makefile	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/rc.d/Makefile	Thu Apr 27 12:59:14 2017	(r317503)
@@ -159,14 +159,6 @@ APM+=		apmd
 APMPACKAGE=	apm
 .endif
 
-.if ${MK_ATM} != "no"
-FILESGROUPS+=	ATM
-ATM+=		atm1
-ATM+=		atm2
-ATM+=		atm3
-ATMPACKAGE=	atm
-.endif
-
 .if ${MK_AUTOFS} != "no"
 FILES+=		automount
 FILES+=		automountd

Modified: projects/clang500-import/etc/rc.d/routing
==============================================================================
--- projects/clang500-import/etc/rc.d/routing	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/etc/rc.d/routing	Thu Apr 27 12:59:14 2017	(r317503)
@@ -36,7 +36,7 @@ routing_start()
 
 	case $_af in
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
-		for _a in inet inet6 atm; do
+		for _a in inet inet6; do
 			afexists $_a || continue
 			setroutes $_cmd $_a $_if || _ret=1
 		done
@@ -65,7 +65,7 @@ routing_stop()
 
 	case $_af in
 	""|[Aa][Ll][Ll]|[Aa][Nn][Yy])
-		for _a in inet inet6 atm; do
+		for _a in inet inet6; do
 			afexists $_a || continue
 			eval static_${_a} delete $_if
 			# When $_if is specified, do not flush routes.
@@ -126,11 +126,6 @@ routing_stop_inet6()
 	done
 }
 
-routing_stop_atm()
-{
-	return 0
-}
-
 get_fibmod()
 {
 	local _fibs
@@ -289,23 +284,6 @@ static_inet6()
 	sysctl net.inet6.ip6.use_defaultzone=1
 }
 
-static_atm()
-{
-	local _action i route_args
-	_action=$1
-
-	if [ -n "${natm_static_routes}" ]; then
-		for i in ${natm_static_routes}; do
-			route_args=`get_if_var $i route_IF`
-			if [ -n "$route_args" ]; then
-				atmconfig natm ${_action} ${route_args}
-			else
-				warn "route_${i} not found."
-			fi
-		done
-	fi
-}
-
 ropts_init()
 {
 	if [ -z "${_ropts_initdone}" ]; then
@@ -391,12 +369,5 @@ options_inet6()
 	[ -n "${_ropts_initdone}" ] && echo '.'
 }
 
-options_atm()
-{
-	_ropts_initdone=
-
-	[ -n "${_ropts_initdone}" ] && echo '.'
-}
-
 load_rc_config $name
 run_rc_command "$@"

Modified: projects/clang500-import/gnu/usr.bin/gdb/Makefile
==============================================================================
--- projects/clang500-import/gnu/usr.bin/gdb/Makefile	Thu Apr 27 12:16:58 2017	(r317502)
+++ projects/clang500-import/gnu/usr.bin/gdb/Makefile	Thu Apr 27 12:59:14 2017	(r317503)
@@ -1,9 +1,15 @@
 # $FreeBSD$
 
-SUBDIR=	libgdb gdb gdbtui kgdb
+.include <src.opts.mk>
+
+SUBDIR=	libgdb gdb kgdb
+
+.if ${MK_GDB_LIBEXEC} == "no"
+SUBDIR+= gdbtui
 

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