[illumos-gate merge]

commit 247b7da039fd88350c50e3d7fef15bdab6bef215
    10205 Mounting zfs filesystems on startup shows incorrect data
commit b928ac841f6012f92d5aedbd7dfacf443921fee3
    10182 dd: print scaled stats
commit c65ebfc7045424bd04a6c7719a27b0ad3399ad54
    8886 mdns: update to mDNSResponder-878.1.1
commit 35786f6866ae52207d0f1a25fe7ca5f652f32ce0
    9823 Deadlock in ACPI Method Evaluation
    9824 Update ACPI to joyent/20180629
commit bc36eafdde0c7048471866fc7cea7b93852592db
    9822 want iasl
commit b75e7d76519aa3dc2e72aa357a039a6b65372a1c
    9821 want a way to run vendor-specific commands via libscsi
commit 2a613b5974ae49c8b068a3998ff554f8c6f0f593
    9747 Implement CPU autoreplace based on Intel PPIN
commit ca13eaa51ee900abba73dfb6624e492f7e48863e
    9979 Support python3 for in-gate tools

	Conflicts:
	usr/src/uts/intel/sys/x86_archext.h
	usr/src/uts/i86pc/os/cmi_hw.c
	usr/src/tools/onbld/Checks/DbLookups.py
	usr/src/lib/fm/topo/modules/i86pc/chip/chip_subr.c

1 files changed, 67 insertions, 0 deletions

diff --git a/usr/src/contrib/mDNSResponder/README b/usr/src/contrib/mDNSResponder/README
new file mode 100644
index 0000000000..ea5d4d4740
--- /dev/null
+++ b/usr/src/contrib/mDNSResponder/README
@@ -0,0 +1,67 @@
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+The mdns vendor source repository is at https://github.com/illumos/mdns/.
+
+Updated from upstream version mDNSResponder-878.1.1
+Updated from upstream version mDNSResponder-625.41.2
+Updated from upstream version mDNSResponder-576.30.4
+
+Multicast DNS and Service Discovery support in Solaris using the
+Apple Bonjour source code (v107.6). Apple Bonjour source can be
+downloaded from:
+	http://developer.apple.com/networking/bonjour/download/
+The following components are integrated from the Apple Bonjour
+source in Solaris:
+  libdns_sd:	usr/src/lib/libdns_sd <dns_sd.h>
+  mdnsd:	usr/src/cmd/cmd-inet/usr.lib/mdnsd
+  dns-sd:	usr/src/cmd/cmd-inet/usr.bin/dns-sd
+
+Following fixes have been made to the Apple Bonjour source
+integrated in Solaris:
+* 64-bit support by adding pad bytes in ipc_msg_hdr_struct
+* 64-bit support in libjdns_sd, dnssd.jar (JNISupport.c, DNSSD.java)
+* mdnsd switches to user 'noaccess' and not 'nobody' after init
+* Fixes to support IPv6 (mDNSPosix.c, mDNSUNP.c)
+* Fix error raised when uDNS.c is compiled with Sun Studio compiler
+* Fix in dnssd_clientstub.c to not check errno when recvmsg returns 0
+* mDNSDebug.c modified to not send msgs directly to console when
+  syslog call returns an error. Logs the messages at LOG_INFO level
+  and not LOG_ERR
+
+In addition the project introduces the following changes:
+* A new nss_mdns module is introduced to use Multicast DNS (mdns)
+  for resolving link-local hostnames and is located at:
+    usr/src/lib/nsswitch/mdns
+* snoop updated to decode mDNS packets
+* updated /etc/services to include mdns
+* <netinet/in.h> updated to include mdns
+* svc:/network/dns/multicast:default introduced to manage mDNS daemon
+* solaris.smf.manage.mdns & solaris.smf.value.mdns authorizations
+  to modify nss_mdns configuration in svc:/network/dns/multicast:default
+  Both authorizations added in network management execution profile.
+* Default nsswitch.dns includes mdns as source for hosts & ipnodes
+* nscd daemon updated to support mdns
+* SUNWdsdu and SUNWdsdr packages deliver all the new mDNS
+  service discovery components.