WIP

exception_lists/copyright

@@ -418,6 +418,7 @@ usr/src/uts/common/gssapi/mechs/krb5/krb5/os/toffset.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/util_seed.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/util_seqnum.c
 usr/src/uts/common/gssapi/mechs/krb5/mech/val_cred.c
+usr/src/uts/common/io/cxgbe/*
 usr/src/uts/common/io/iwn/THIRDPARTYLICENSE
 usr/src/uts/common/io/iwn/THIRDPARTYLICENSE.descrip
 usr/src/uts/common/io/iwn/fw-iw/THIRDPARTYLICENSE

exception_lists/cstyle

@@ -100,73 +100,7 @@ usr/src/cmd/krb5/ldap_util/kdb5_ldap_util.h
 usr/src/cmd/krb5/slave/kprop.c
 usr/src/cmd/krb5/slave/kprop.h
 usr/src/cmd/krb5/slave/kpropd.c
-usr/src/cmd/mandoc/att.c
-usr/src/cmd/mandoc/chars.c
-usr/src/cmd/mandoc/compat_ohash.c
-usr/src/cmd/mandoc/compat_ohash.h
-usr/src/cmd/mandoc/compat_reallocarray.c
-usr/src/cmd/mandoc/compat_strtonum.c
-usr/src/cmd/mandoc/config.h
-usr/src/cmd/mandoc/eqn_html.c
-usr/src/cmd/mandoc/eqn_term.c
-usr/src/cmd/mandoc/eqn.c
-usr/src/cmd/mandoc/html.c
-usr/src/cmd/mandoc/html.h
-usr/src/cmd/mandoc/lib.c
-usr/src/cmd/mandoc/libman.h
-usr/src/cmd/mandoc/libmandoc.h
-usr/src/cmd/mandoc/libmdoc.h
-usr/src/cmd/mandoc/libroff.h
-usr/src/cmd/mandoc/main.c
-usr/src/cmd/mandoc/main.h
-usr/src/cmd/mandoc/man_hash.c
-usr/src/cmd/mandoc/man_html.c
-usr/src/cmd/mandoc/man_macro.c
-usr/src/cmd/mandoc/man_term.c
-usr/src/cmd/mandoc/man_validate.c
-usr/src/cmd/mandoc/man.c
-usr/src/cmd/mandoc/man.h
-usr/src/cmd/mandoc/manconf.h
-usr/src/cmd/mandoc/mandoc_aux.c
-usr/src/cmd/mandoc/mandoc_aux.h
-usr/src/cmd/mandoc/mandoc_ohash.c
-usr/src/cmd/mandoc/mandoc_ohash.h
-usr/src/cmd/mandoc/mandoc.c
-usr/src/cmd/mandoc/mandoc.h
-usr/src/cmd/mandoc/manpath.c
-usr/src/cmd/mandoc/mansearch.h
-usr/src/cmd/mandoc/mdoc_argv.c
-usr/src/cmd/mandoc/mdoc_hash.c
-usr/src/cmd/mandoc/mdoc_html.c
-usr/src/cmd/mandoc/mdoc_macro.c
-usr/src/cmd/mandoc/mdoc_man.c
-usr/src/cmd/mandoc/mdoc_state.c
-usr/src/cmd/mandoc/mdoc_term.c
-usr/src/cmd/mandoc/mdoc_validate.c
-usr/src/cmd/mandoc/mdoc.c
-usr/src/cmd/mandoc/mdoc.h
-usr/src/cmd/mandoc/msec.c
-usr/src/cmd/mandoc/out.c
-usr/src/cmd/mandoc/out.h
-usr/src/cmd/mandoc/preconv.c
-usr/src/cmd/mandoc/read.c
-usr/src/cmd/mandoc/roff_int.h
-usr/src/cmd/mandoc/roff.c
-usr/src/cmd/mandoc/roff.h
-usr/src/cmd/mandoc/st.c
-usr/src/cmd/mandoc/tag.c
-usr/src/cmd/mandoc/tag.h
-usr/src/cmd/mandoc/tbl_data.c
-usr/src/cmd/mandoc/tbl_html.c
-usr/src/cmd/mandoc/tbl_layout.c
-usr/src/cmd/mandoc/tbl_opts.c
-usr/src/cmd/mandoc/tbl_term.c
-usr/src/cmd/mandoc/tbl.c
-usr/src/cmd/mandoc/term_ascii.c
-usr/src/cmd/mandoc/term_ps.c
-usr/src/cmd/mandoc/term.c
-usr/src/cmd/mandoc/term.h
-usr/src/cmd/mandoc/tree.c
+usr/src/cmd/mandoc
 usr/src/cmd/ttymon/sttyparse.c
 usr/src/common/ficl/ficltokens.h
 usr/src/common/bzip2/bzlib.h
@@ -678,11 +612,16 @@ usr/src/lib/libsmbfs/smb/derparse.h
 usr/src/lib/libsmbfs/smb/spnego.c
 usr/src/lib/libsmbfs/smb/spnegoparse.c
 usr/src/lib/libsmbfs/smb/spnegoparse.h
+usr/src/test/os-tests/tests/sockfs/conn.c
+usr/src/test/os-tests/tests/sockfs/dgram.c
+usr/src/test/os-tests/tests/sockfs/drop_priv.c
+usr/src/test/os-tests/tests/sockfs/sockpair.c
 usr/src/tools/btxld/btx.h
 usr/src/tools/btxld/btxld.c
 usr/src/tools/btxld/elfh.c
 usr/src/tools/btxld/elfh.h
 usr/src/tools/btxld/imgact_aout.h
+usr/src/uts/common/fs/zfs/lua/*
 usr/src/uts/common/gssapi/gssapi.h
 usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c
 usr/src/uts/common/gssapi/mechs/krb5/crypto/checksum_length.c

exception_lists/hdrchk

@@ -36,26 +36,7 @@ usr/src/cmd/krb5/ldap_util/kdb5_ldap_services.h
 usr/src/cmd/krb5/ldap_util/kdb5_ldap_util.h
 usr/src/cmd/krb5/slave/kprop.h
 usr/src/cmd/localedef/localedef.h
-usr/src/cmd/mandoc/compat_ohash.h
-usr/src/cmd/mandoc/config.h
-usr/src/cmd/mandoc/html.h
-usr/src/cmd/mandoc/libman.h
-usr/src/cmd/mandoc/libmandoc.h
-usr/src/cmd/mandoc/libmdoc.h
-usr/src/cmd/mandoc/libroff.h
-usr/src/cmd/mandoc/main.h
-usr/src/cmd/mandoc/man.h
-usr/src/cmd/mandoc/manconf.h
-usr/src/cmd/mandoc/mandoc_aux.h
-usr/src/cmd/mandoc/mandoc_ohash.h
-usr/src/cmd/mandoc/mandoc.h
-usr/src/cmd/mandoc/mansearch.h
-usr/src/cmd/mandoc/mdoc.h
-usr/src/cmd/mandoc/out.h
-usr/src/cmd/mandoc/roff_int.h
-usr/src/cmd/mandoc/roff.h
-usr/src/cmd/mandoc/tag.h
-usr/src/cmd/mandoc/term.h
+usr/src/cmd/mandoc
 usr/src/common/ficl/ficltokens.h
 usr/src/grub/grub-0.97/stage2/shared.h
 usr/src/lib/gss_mechs/mech_krb5/et/error_table.h
@@ -322,6 +303,8 @@ usr/src/uts/common/io/bnxe/bnxe_debug.h
 usr/src/uts/common/io/bnxe/bnxe.h
 usr/src/uts/common/io/bnxe/version.h
 usr/src/uts/common/io/cxgbe/firmware/*
+usr/src/uts/common/io/cxgbe/common/t4_msg.h
+usr/src/uts/common/io/cxgbe/common/t4_regs.h
 usr/src/uts/common/io/e1000api/e1000_80003es2lan.h
 usr/src/uts/common/io/e1000api/e1000_82541.h
 usr/src/uts/common/io/e1000api/e1000_82543.h

exception_lists/keywords

@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 # Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright 2011 Nexenta Systems, Inc. All rights reserved.
+# Copyright 2017 Nexenta Systems, Inc.
 # Copyright (c) 2013 by Delphix. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
 #
@@ -28,14 +28,14 @@ syntax: glob
 usr/src/boot/*
 usr/src/cmd/cmd-inet/usr.bin/dns-sd/dns-sd.c
 usr/src/cmd/boot/common/bblk_einfo.c
-usr/src/cmd/localedef/data/zh_CN.UTF-8.src
-usr/src/cmd/localedef/data/zh_HK.UTF-8.src
-usr/src/cmd/localedef/data/zh_MO.UTF-8.src
-usr/src/cmd/localedef/data/zh_SG.UTF-8.src
-usr/src/cmd/localedef/data/zh_TW.UTF-8.src
-usr/src/cmd/terminfo/termcap.src
-usr/src/cmd/terminfo/terminfo.src
 usr/src/cmd/zonestat/zonestat/zonestat.c
+usr/src/data/locale/data/zh_CN.UTF-8.src
+usr/src/data/locale/data/zh_HK.UTF-8.src
+usr/src/data/locale/data/zh_MO.UTF-8.src
+usr/src/data/locale/data/zh_SG.UTF-8.src
+usr/src/data/locale/data/zh_TW.UTF-8.src
+usr/src/data/terminfo/termcap.src
+usr/src/data/terminfo/terminfo.src
 usr/src/test/zfs-tests/tests/functional/cli_root/zpool_upgrade/blockfiles/zfs-pool-v15.dat.bz2
 usr/src/test/zfs-tests/tests/functional/delegate/delegate_common.kshlib
 usr/src/test/test-runner/cmd/run

exception_lists/packaging

@@ -23,9 +23,9 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012 OmniTI Computer Consulting, Inc.  All rights reserved.
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
-# Copyright 2016 Toomas Soome <tsoome@me.com>
 # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
 # Copyright 2016 Nexenta Systems, Inc.
+# Copyright 2017 Toomas Soome <tsoome@me.com>
 #
 
 #
@@ -629,6 +629,7 @@ usr/lib/fs/autofs/sparcv9/libshare_autofs.so		sparc
 usr/lib/fs/nfs/libshare_nfs.so
 usr/lib/fs/nfs/amd64/libshare_nfs.so		i386
 usr/lib/fs/nfs/sparcv9/libshare_nfs.so		sparc
+usr/lib/fs/nfs/test_svc_tp_create
 usr/lib/fs/smb/libshare_smb.so
 usr/lib/fs/smb/amd64/libshare_smb.so		i386
 usr/lib/fs/smb/sparcv9/libshare_smb.so		sparc
@@ -927,10 +928,10 @@ usr/lib/sparcv9/llib-lvrrpadm.ln	sparc
 #
 # This is only used during the -t tools build
 #
-opt/onbld/bin/i386/elfsign	i386
-opt/onbld/bin/sparc/elfsign	sparc
 opt/onbld/bin/i386/mandoc	i386
 opt/onbld/bin/sparc/mandoc	sparc
+opt/onbld/bin/i386/vtfontcvt	i386
+opt/onbld/bin/sparc/vtfontcvt	sparc
 
 #
 # Private libdwarf
@@ -979,6 +980,11 @@ usr/lib/libpcidb.so
 usr/lib/llib-lpcidb
 usr/lib/llib-lpcidb.ln
 
+#
+# private nvme header file
+#
+usr/include/sys/nvme.h
+
 #
 # debugging program for libadutils
 #

usr/src/Makefile

@@ -25,7 +25,7 @@
 # Copyright 2014 Garrett D'Amore <garrett@damore.org>
 # Copyright 2015 OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2016 Toomas Soome <tsoome@me.com>
-# Copyright 2016 Joyent, Inc.
+# Copyright 2017 Joyent, Inc.
 #
 
 #
@@ -38,7 +38,7 @@ include Makefile.master
 # it defines TARGETDIRS and ROOTDIRS.
 include Targetdirs
 
-COMMON_SUBDIRS=	uts lib cmd ucblib ucbcmd psm man test
+COMMON_SUBDIRS=	data uts lib cmd ucblib ucbcmd psm man test
 sparc_SUBDIRS= stand
 i386_SUBDIRS= grub boot
 
@@ -64,15 +64,15 @@ PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders
 #
 # Directories that can be built in parallel
 #
-PARALLEL_DIRS = uts lib man
+PARALLEL_DIRS = data uts lib man
 
 # The check target also causes smf(5) service manifests to be validated.
 CHKMFSTSUBDIRS=	cmd
 
 # And man page formats
 CHKMANSUBDIRS = man
 
-MSGSUBDIRS=	cmd ucbcmd lib
+MSGSUBDIRS=	cmd ucbcmd lib data
 DOMAINS= \
 	SUNW_OST_ADMIN \
 	SUNW_OST_NETRPC \
@@ -123,7 +123,7 @@ stage-licenses: install2
 
 install1: mapfiles closedbins sgs
 
-install2: install1 $(SUBDIRS)
+install2: install1 .WAIT $(SUBDIRS)
 
 _msg: _msgdirs rootdirs FRC
 	@for m in $(MSGSUBDIRS); do \

usr/src/Makefile.master

@@ -103,7 +103,6 @@ __GNUC64=		$(__GNUC)
 # The default is POUND_SIGN, meaning "not enabled". If the environment
 # passes in an override like ENABLE_SMB_PRINTING= (empty) that will
 # uncomment things in the lower Makefiles to enable the feature.
-ENABLE_IPP_PRINTING=	$(POUND_SIGN)
 ENABLE_SMB_PRINTING=	$(POUND_SIGN)
 
 # CLOSED is the root of the tree that contains source which isn't released
@@ -134,6 +133,7 @@ STABS=		$(ONBLD_TOOLS)/bin/$(MACH)/stabs
 ELFEXTRACT=	$(ONBLD_TOOLS)/bin/$(MACH)/elfextract
 MBH_PATCH=	$(ONBLD_TOOLS)/bin/$(MACH)/mbh_patch
 BTXLD=		$(ONBLD_TOOLS)/bin/$(MACH)/btxld
+VTFONTCVT=	$(ONBLD_TOOLS)/bin/$(MACH)/vtfontcvt
 ECHO=		echo
 INS=		install
 TRUE=		true
@@ -187,13 +187,15 @@ TOUCH=		/usr/bin/touch
 WC=		/usr/bin/wc
 XARGS=		/usr/bin/xargs
 ELFEDIT=	/usr/bin/elfedit
-ELFSIGN=	/usr/bin/elfsign
 DTRACE=		/usr/sbin/dtrace -xnolibs
 UNIQ=		/usr/bin/uniq
 TAR=		/usr/bin/tar
 ASTBINDIR=	/usr/ast/bin
 MSGCC=		$(ASTBINDIR)/msgcc
 MSGFMT=		/usr/bin/msgfmt -s
+LCDEF=		$(ONBLD_TOOLS)/bin/$(MACH)/localedef
+TIC=		$(ONBLD_TOOLS)/bin/$(MACH)/tic
+ZIC=		$(ONBLD_TOOLS)/bin/$(MACH)/zic
 
 FILEMODE=	644
 DIRMODE=	755
@@ -918,10 +920,6 @@ CTFMRGFLAGS=
 
 CTFCONVERT_O		= $(CTFCONVERT) $(CTFCVTFLAGS) $@
 
-ELFSIGN_O=	$(TRUE)
-ELFSIGN_CRYPTO=	$(ELFSIGN_O)
-ELFSIGN_OBJECT=	$(ELFSIGN_O)
-
 # Rules (normally from make.rules) and macros which are used for post
 # processing files. Normally, these do stripping of the comment section
 # automatically.

usr/src/boot/Makefile.version

@@ -33,4 +33,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2017.3.15.1
+BOOT_VERSION = $(LOADER_VERSION)-2017.9.11.1

usr/src/boot/lib/libc/string/stpcpy.c

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 1999
+ *	David E. O'Brien
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+
+#include <string.h>
+
+char *
+stpcpy(char * __restrict to, const char * __restrict from)
+{
+
+	for (; (*to = *from); ++from, ++to);
+	return (to);
+}

usr/src/boot/lib/libc/string/stpncpy.c

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2009 David Schultz <das@FreeBSD.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+#include <string.h>
+
+char *
+stpncpy(char * __restrict dst, const char * __restrict src, size_t n)
+{
+
+	for (; n--; dst++, src++) {
+		if (!(*dst = *src)) {
+			char *ret = dst;
+			while (n--)
+				*++dst = '\0';
+			return (ret);
+		}
+	}
+	return (dst);
+}