[illumos-gate merge]release-20170330

commit c71d194a355d17467b4730bbc641c3a40bfb68fd
    8003 man page typos
commit 714901a982d5d1bbb9fd9f5e46ddd7cacfcf9cdc
    7986 loader: remove network mask calculation for Classful network
commit ce326879a41b052db3abafb44e551f9d9c40cdba
    7982 zfstest -a destroys rpool on IDE disks and should strip partition numbers

6 files changed, 21 insertions, 33 deletions

diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index d5b5b2a149..0a3c013869 100644
--- a/usr/src/boot/Makefile.version
+++ b/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.20.1
+BOOT_VERSION = $(LOADER_VERSION)-2017.3.26.1
diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/lib/libstand/bootp.c
index 53fbe566d2..d1d4378bab 100644
--- a/usr/src/boot/lib/libstand/bootp.c
+++ b/usr/src/boot/lib/libstand/bootp.c
@@ -63,8 +63,6 @@ __FBSDID("$FreeBSD$");
 
 struct in_addr servip;
 
-static n_long	nmask, smask;
-
 static time_t	bot;
 
 static	char vm_rfc1048[4] = VM_RFC1048;
@@ -222,30 +220,19 @@ bootp(int sock, int flag)
 	bcopy(rbuf.rbootp.bp_file, bootfile, sizeof(bootfile));
 	bootfile[sizeof(bootfile) - 1] = '\0';
 
-	if (IN_CLASSA(ntohl(myip.s_addr)))
-		nmask = htonl(IN_CLASSA_NET);
-	else if (IN_CLASSB(ntohl(myip.s_addr)))
-		nmask = htonl(IN_CLASSB_NET);
-	else
-		nmask = htonl(IN_CLASSC_NET);
-#ifdef BOOTP_DEBUG
-	if (debug)
-		printf("'native netmask' is %s\n", intoa(nmask));
-#endif
-
-	/* Check subnet mask against net mask; toss if bogus */
-	if ((nmask & smask) != nmask) {
+	if (!netmask) {
+		if (IN_CLASSA(ntohl(myip.s_addr)))
+			netmask = htonl(IN_CLASSA_NET);
+		else if (IN_CLASSB(ntohl(myip.s_addr)))
+			netmask = htonl(IN_CLASSB_NET);
+		else
+			netmask = htonl(IN_CLASSC_NET);
 #ifdef BOOTP_DEBUG
 		if (debug)
-			printf("subnet mask (%s) bad\n", intoa(smask));
+			printf("'native netmask' is %s\n", intoa(netmask));
 #endif
-		smask = 0;
 	}
 
-	/* Get subnet (or natural net) mask */
-	netmask = nmask;
-	if (smask)
-		netmask = smask;
 #ifdef BOOTP_DEBUG
 	if (debug)
 		printf("mask: %s\n", intoa(netmask));
@@ -375,7 +362,7 @@ vend_rfc1048(u_char *cp, u_int len)
 			break;
 
 		if (tag == TAG_SUBNET_MASK) {
-			bcopy(cp, &smask, sizeof(smask));
+			bcopy(cp, &netmask, sizeof(netmask));
 		}
 		if (tag == TAG_GATEWAY) {
 			bcopy(cp, &gateip.s_addr, sizeof(gateip.s_addr));
@@ -452,7 +439,7 @@ vend_cmu(u_char *cp)
 	vp = (struct cmu_vend *)cp;
 
 	if (vp->v_smask.s_addr != 0) {
-		smask = vp->v_smask.s_addr;
+		netmask = vp->v_smask.s_addr;
 	}
 	if (vp->v_dgate.s_addr != 0) {
 		gateip = vp->v_dgate;
diff --git a/usr/src/man/man3c/eventfd.3c b/usr/src/man/man3c/eventfd.3c
index 459f0457f9..b0c74e1d51 100644
--- a/usr/src/man/man3c/eventfd.3c
+++ b/usr/src/man/man3c/eventfd.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (c) 2014, Joyent, Inc. All Rights Reserved.
 .\"
-.Dd April 9, 2016
+.Dd March 26, 2017
 .Dt EVENTFD 3C
 .Os
 .Sh NAME
@@ -96,7 +96,7 @@ depend on the disposition of
 .Sy EFD_SEMAPHORE
 with
 respect to the instance: if
-.Sy EFD_SEMAPTHORE
+.Sy EFD_SEMAPHORE
 was set when the instance was created,
 .Xr read 2
 will
diff --git a/usr/src/man/man3c/timerfd_create.3c b/usr/src/man/man3c/timerfd_create.3c
index 68a7d17b17..432717f6e9 100644
--- a/usr/src/man/man3c/timerfd_create.3c
+++ b/usr/src/man/man3c/timerfd_create.3c
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright (c) 2015, Joyent, Inc. All Rights Reserved.
 .\"
-.Dd April 9, 2016
+.Dd March 26, 2017
 .Dt TIMERFD 3C
 .Os
 .Sh NAME
@@ -129,7 +129,7 @@ If the buffer specified to
 .Xr read 2
 is less than
 eight bytes in length,
-.Sy EINAVL
+.Sy EINVAL
 will be returned.
 .Ed
 .It Sy poll(2), port_get(3C), epoll_wait(3C)
diff --git a/usr/src/man/man9e/mac.9e b/usr/src/man/man9e/mac.9e
index 18e12be957..68ab72150d 100644
--- a/usr/src/man/man9e/mac.9e
+++ b/usr/src/man/man9e/mac.9e
@@ -11,7 +11,7 @@
 .\"
 .\" Copyright 2016 Joyent, Inc.
 .\"
-.Dd May 11, 2016
+.Dd March 26, 2017
 .Dt MAC 9E
 .Os
 .Sh NAME
@@ -483,7 +483,7 @@ the device is required to fill in. Note, the set of capabilities changes
 over time and there are also private capabilities in the system. Several
 of the capabilities are used in the implementation of the MAC framework.
 Others, like
-.Sy MAC_CAPAB_RIGNS ,
+.Sy MAC_CAPAB_RINGS ,
 represent feature that have not been stabilized and thus both API and
 binary compatibility for them is not guaranteed. It is important that
 the device driver handles unknown capabilities correctly.  For more
@@ -633,7 +633,7 @@ entry point updates the property to a new value.
 .Pp
 Many of the properties listed below are read-only. Each property
 indicates whether it's read-only or it's read/write. However, driver
-writers may not implement the ability to set all writeable properties.
+writers may not implement the ability to set all writable properties.
 Many of these depend on the card itself. In particular, all properties
 that relate to auto-negotiation and are read/write may not be updated
 if the hardware in question does not support toggling what link speeds
@@ -1489,7 +1489,7 @@ as report other errors that exist. While a device driver does not need to
 indicate that it is capable of all such capabilities described in
 .Xr ddi_fm_init 9F ,
 we suggest that device drivers at least register the
-.Sy DDI_FM_EREPORT_CAPABILITY
+.Sy DDI_FM_EREPORT_CAPABLE
 so as to allow the driver to report issues that it detects.
 .Pp
 If the driver registers with the fault management framework during its
diff --git a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
index 6b492058e2..603f27812f 100644
--- a/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
+++ b/usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
@@ -40,7 +40,8 @@ function find_disks
 	typeset all_disks=$(echo '' | sudo -k format | awk \
 	    '/c[0-9]/ {print $2}')
 	typeset used_disks=$(zpool status | awk \
-	    '/c[0-9]*t[0-9a-f]*d[0-9]/ {print $1}' | sed 's/s[0-9]//g')
+	    '/c[0-9]+(t[0-9a-f]+)?d[0-9]+/ {print $1}' | sed -E \
+	    's/(s|p)[0-9]+//g')
 
 	typeset disk used avail_disks
 	for disk in $all_disks; do