[illumos-gate merge]release-20180215

commit 750a7e45cc1795462d627c610964b7ceb020a0b0
    9078 Update hwdata - 20180208
commit d6e1c446d7897003fd9fd36ef5aa7da350b7f6af
    8857 zio_remove_child() panic due to already destroyed parent zio
commit d9a54dd1ef75248420c035ec1d240674f8d1f4fb
    9074 domount() interprets ZFS filesystem names as relative paths
commit 213fcdcbdccbdeb7d33fbae7ba8d2639a6f8fd01
    9077 zloop misses core files because they're no longer written into cwd
commit 544132fce3fa6583f01318f9559adc46614343a7
    8940 Sending an intra-pool resumable send stream may result in EXDEV
commit bdfded42e66b9fc1395ff2401aa2952f7c44ae34
    9080 recursive enter of vdev_indirect_rwlock from vdev_indirect_remap()
commit 667ec66f1b4f491d5e839644e0912cad1c9e7122
    9079 race condition in starting and ending condesing thread for indirect vdevs
commit 6f7938128a2c5e23f4b970ea101137eadd1470a1
    9075 Improve ZFS pool import/load process and corrupted pool recovery
commit 6bb6b5762ca4b17cd5fb3c6c123f17489d5635aa
    9100 remove sunman rules from the gate

	Conflicts:
	usr/src/cmd/smbios/smbios.c

7 files changed, 25 insertions, 27 deletions

diff --git a/usr/src/cmd/Makefile.cmd b/usr/src/cmd/Makefile.cmd
index e00665a839..14102c6008 100644
--- a/usr/src/cmd/Makefile.cmd
+++ b/usr/src/cmd/Makefile.cmd
@@ -96,10 +96,6 @@ ROOTCMDDIR64=	$(ROOTCMDDIR)/$(MACH64)
 ROOTLIB64=	$(ROOTLIB)/$(MACH64)
 ROOTUSRSBIN32=	$(ROOTUSRSBIN)/$(MACH32)
 ROOTUSRSBIN64=	$(ROOTUSRSBIN)/$(MACH64)
-ROOTMAN=	$(ROOT)/usr/share/man
-ROOTMAN1=	$(ROOTMAN)/man1
-ROOTMAN1M=	$(ROOTMAN)/man1m
-ROOTMAN3=	$(ROOTMAN)/man3
 ROOTVARSMB=	$(ROOT)/var/smb
 
 
@@ -164,12 +160,6 @@ ROOTPROG32=	$(PROG:%=$(ROOTBIN32)/%)
 ROOTCMD64=	$(PROG:%=$(ROOTCMDDIR64)/%)
 ROOTUSRSBINPROG32=	$(PROG:%=$(ROOTUSRSBIN32)/%)
 ROOTUSRSBINPROG64=	$(PROG:%=$(ROOTUSRSBIN64)/%)
-ROOTMAN1FILES=	$(MAN1FILES:%=$(ROOTMAN1)/%)
-$(ROOTMAN1FILES) := FILEMODE= 444
-ROOTMAN1MFILES=	$(MAN1MFILES:%=$(ROOTMAN1M)/%)
-$(ROOTMAN1MFILES) := FILEMODE= 444
-ROOTMAN3FILES=	$(MAN3FILES:%=$(ROOTMAN3)/%)
-$(ROOTMAN3FILES) := FILEMODE= 444
 
 # Symlink rules for /usr/ccs/bin commands. Note, those commands under
 # the rule of the linker area, are controlled by a different set of 
@@ -475,15 +465,6 @@ $(ROOTCCSBINLINKDIR)/%: %
 $(ROOTCCSBINLINKDIR64)/%: %
 	$(INS.ccsbinlink64)
 
-$(ROOTMAN1)/%: %.sunman
-	$(INS.rename)
-
-$(ROOTMAN1M)/%: %.sunman
-	$(INS.rename)
-
-$(ROOTMAN3)/%: %.sunman
-	$(INS.rename)
-
 $(ROOTVARSMB)/%: %
 	$(INS.file)
 
diff --git a/usr/src/cmd/mdb/common/modules/zfs/zfs.c b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
index 75d9fbd102..5a28582be0 100644
--- a/usr/src/cmd/mdb/common/modules/zfs/zfs.c
+++ b/usr/src/cmd/mdb/common/modules/zfs/zfs.c
@@ -1569,6 +1569,9 @@ do_print_vdev(uintptr_t addr, int flags, int depth, boolean_t recursive,
 		case VDEV_AUX_SPLIT_POOL:
 			aux = "SPLIT_POOL";
 			break;
+		case VDEV_AUX_CHILDREN_OFFLINE:
+			aux = "CHILDREN_OFFLINE";
+			break;
 		default:
 			aux = "UNKNOWN";
 			break;
diff --git a/usr/src/cmd/pcitool/i386/Makefile b/usr/src/cmd/pcitool/i386/Makefile
index 49e793dddf..5d25e74b30 100644
--- a/usr/src/cmd/pcitool/i386/Makefile
+++ b/usr/src/cmd/pcitool/i386/Makefile
@@ -17,14 +17,15 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pcitool/i386/Makefile
 
 include ../Makefile.com
 
 CPPFLAGS += -I../../../../src/uts/i86pc
 LINTFLAGS 	+= -erroff=E_STATIC_UNUSED
 
-install: all $(ROOTUSRSBINPROG) $(ROOTMAN1MFILES)
+install: all $(ROOTUSRSBINPROG)
diff --git a/usr/src/cmd/pcitool/sparc/Makefile b/usr/src/cmd/pcitool/sparc/Makefile
index 8860a49d3a..960d780517 100644
--- a/usr/src/cmd/pcitool/sparc/Makefile
+++ b/usr/src/cmd/pcitool/sparc/Makefile
@@ -17,13 +17,14 @@
 #
 # CDDL HEADER END
 #
+
+#
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/pcitool/sparc/Makefile
 
 include ../Makefile.com
 
 LINTFLAGS 	+= -erroff=E_STATIC_UNUSED
 
-install: all $(ROOTUSRSBINPROG) $(ROOTMAN1MFILES)
+install: all $(ROOTUSRSBINPROG)
diff --git a/usr/src/cmd/smbios/smbios.c b/usr/src/cmd/smbios/smbios.c
index 8c1d7a4d7e..2bac9156a5 100644
--- a/usr/src/cmd/smbios/smbios.c
+++ b/usr/src/cmd/smbios/smbios.c
@@ -550,9 +550,9 @@ print_processor(smbios_hdl_t *shp, id_t id, FILE *fp)
 	else
 		oprintf(fp, "  Current Speed: Unknown\n");
 
-	id_printf(fp, "  L1 Cache Handle: ", p.smbp_l1cache);
-	id_printf(fp, "  L2 Cache Handle: ", p.smbp_l2cache);
-	id_printf(fp, "  L3 Cache Handle: ", p.smbp_l3cache);
+	id_printf(fp, "  L1 Cache: ", p.smbp_l1cache);
+	id_printf(fp, "  L2 Cache: ", p.smbp_l2cache);
+	id_printf(fp, "  L3 Cache: ", p.smbp_l3cache);
 }
 
 static void
diff --git a/usr/src/cmd/zpool/zpool_main.c b/usr/src/cmd/zpool/zpool_main.c
index 8d9c95b958..f3a313907b 100644
--- a/usr/src/cmd/zpool/zpool_main.c
+++ b/usr/src/cmd/zpool/zpool_main.c
@@ -1563,6 +1563,10 @@ print_status_config(zpool_handle_t *zhp, const char *name, nvlist_t *nv,
 			(void) printf(gettext("split into new pool"));
 			break;
 
+		case VDEV_AUX_CHILDREN_OFFLINE:
+			(void) printf(gettext("all children offline"));
+			break;
+
 		default:
 			(void) printf(gettext("corrupted data"));
 			break;
@@ -1650,6 +1654,10 @@ print_import_config(const char *name, nvlist_t *nv, int namewidth, int depth)
 			(void) printf(gettext("too many errors"));
 			break;
 
+		case VDEV_AUX_CHILDREN_OFFLINE:
+			(void) printf(gettext("all children offline"));
+			break;
+
 		default:
 			(void) printf(gettext("corrupted data"));
 			break;
@@ -2297,6 +2305,7 @@ zpool_do_import(int argc, char **argv)
 	idata.poolname = searchname;
 	idata.guid = searchguid;
 	idata.cachefile = cachefile;
+	idata.policy = policy;
 
 	pools = zpool_search_import(g_zfs, &idata);
 
diff --git a/usr/src/cmd/ztest/zloop.bash b/usr/src/cmd/ztest/zloop.bash
index 2410eaa985..96d796ae0c 100755
--- a/usr/src/cmd/ztest/zloop.bash
+++ b/usr/src/cmd/ztest/zloop.bash
@@ -16,7 +16,7 @@
 #
 
 #
-# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2017 by Delphix. All rights reserved.
 #
 
 set -x
@@ -146,6 +146,9 @@ fi
 or_die /bin/rm -f ztest.history
 or_die /bin/rm -f ztest.cores
 
+# Allow core files to be written to cwd if that's currently disabled.
+sudo coreadm -e process
+
 ztrc=0		# ztest return value
 foundcrashes=0	# number of crashes found so far
 starttime=$(/bin/date +%s)