[illumos-gate merge]

commit 45de8795bcb0e4c49743f37edfdd2c89d5a7863b
    12683 w(1) and whodo(1) should silently skip dirs it cannot open
commit 6112cec5d5374dff12a12bd285afeb5e660b7154
    12517 allow for custom per-distribution branding
commit 15fa1d047e03d3f123546d72f130c5ce4b278eba
    12519 Targetdirs: remove left over /usr/4lib
commit 85ba5240e8fe32c7405930a51a93630182ce67d7
    12551 cmlb: NULL pointer errors

	Conflicts:
	usr/src/uts/common/os/logsubr.c
	usr/src/uts/common/Makefile.rules
	usr/src/cmd/init/init.c
	usr/src/cmd/init/Makefile
	usr/src/cmd/Adm/sun/Makefile

3 files changed, 26 insertions, 12 deletions

diff --git a/exception_lists/check_rtime b/exception_lists/check_rtime
index e42084ffc7..467996f9b4 100644
--- a/exception_lists/check_rtime
+++ b/exception_lists/check_rtime
@@ -25,6 +25,7 @@
 # Copyright 2018 Joyent, Inc.
 # Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
 # Copyright 2019 Peter Tribble.
+# Copyright 2020 Oxide Computer Company
 #
 
 # This file provides exceptions to the usual rules applied to ELF objects by
@@ -88,7 +89,6 @@ TEXTREL		^usr/sbin/bhyve$
 # Directories and files that are allowed to have no direct bound symbols
 NODIRECT	^platform/.*/MACH(kernel)/unix$
 NODIRECT	^usr/ucb
-NODIRECT	^usr/4lib/sbcp$
 
 # Identify any files that should be skipped when building a crle(1)
 # configuration file.  As the hwcap libraries can be loop-back mounted onto
@@ -261,3 +261,24 @@ FORBIDDEN libxcurses\.so\.1
 EXEC_STACK	^opt/SUNWonld
 EXEC_DATA	^opt/SUNWonld
 NODIRECT	^opt/SUNWonld
+
+#
+# Closed binaries have an old mcs comment mentioning SunOS rather than
+# illumos.  These comments are not generated as part of the build, and
+# it seems wrong to rewrite them; ignore them instead.
+#
+NO_COMMENT	^usr/bin/pax
+NO_COMMENT	^usr/lib/amd64/libike\.so\.1
+NO_COMMENT	^usr/lib/fwflash/verify/ses-SUN\.so
+NO_COMMENT	^usr/lib/inet/amd64/in\.iked
+NO_COMMENT	^usr/lib/inet/certdb
+NO_COMMENT	^usr/lib/inet/certlocal
+NO_COMMENT	^usr/lib/inet/certrldb
+NO_COMMENT	^usr/lib/labeld
+NO_COMMENT	^usr/lib/libike\.so\.1
+NO_COMMENT	^usr/lib/mdb/kvm/amd64/mpt\.so
+NO_COMMENT	^usr/lib/mdb/kvm/amd64/nfs\.so
+NO_COMMENT	^usr/lib/raidcfg/amd64/mpt\.so\.1
+NO_COMMENT	^usr/lib/raidcfg/mpt\.so\.1
+NO_COMMENT	^usr/sbin/chk_encodings
+NO_COMMENT	^usr/xpg4/bin/more
diff --git a/exception_lists/interface_check b/exception_lists/interface_check
index 78e1c95719..198e89e85a 100644
--- a/exception_lists/interface_check
+++ b/exception_lists/interface_check
@@ -70,15 +70,9 @@ PLUGIN		^usr/sadm/lib/wbem
 PLUGIN		^usr/lib/dtrace/libdtrace_forceload\.so$
 PLUGIN		^usr/lib/dtrace/64/libdtrace_forceload\.so$
 
-# sbcp is a special case, and not a plugin. However, it does not have a
-# versioned name, and does not contain versioning, so the PLUGIN exemptions fit.
-PLUGIN	^usr/4lib/sbcp$
-
-
 # Objects that are not expected to contain versioning information.
 # Note that PLUGIN objects are automatically exempt from this,
 # so these directives are generally applied to non-plugin objects
-NOVERDEF	^usr/4lib/libc\.so\.
 NOVERDEF	^usr/MACH(lib)/0\@0\.so\.1$
 NOVERDEF	^usr/lib/MACH(abi)/apptrace\.so\.1$
 NOVERDEF	^usr/MACH(lib)/libfru.*\.so\.1$
diff --git a/exception_lists/packaging b/exception_lists/packaging
index 09096fc4c9..3c65d11c27 100644
--- a/exception_lists/packaging
+++ b/exception_lists/packaging
@@ -162,11 +162,6 @@ usr/include/inet/sadb.h
 usr/include/sys/sha1_consts.h
 usr/include/sys/sha2_consts.h
 #
-#
-# Filtering out directories not shipped
-#
-usr/4lib				i386
-#
 # These files contain definitions shared privately between the kernel
 # and libc.  There is no reason for them to be part of a package that
 # a customer should ever see.  They are installed in the proto area by
@@ -530,6 +525,10 @@ usr/platform/sun4v/include/sys/vlds.h	sparc
 #
 usr/include/sys/u8_textprep_data.h
 #
+# Private, for the boot banner code shared between zone init and the kernel:
+#
+usr/include/sys/bootbanner.h
+#
 # SQLite is private, used by SMF (svc.configd), idmapd and libsmb.
 #
 usr/include/sqlite-sys