[illumos-gate merge]

commit a4888653b44963eab5e74d73b1ac425648d2e62b
    6828 iprb should have alias for pci8086,1064
commit 6a19b8666104dbf912da5a4fb193c9c2b29e21bb
    4740 kstat(1M) prints wrong snaptime
commit 1ef6182819f36233702ddc54686e703bb23a0153
    2902 iscsit should fold the case of scsi names that we get from initiators
commit 2e27316f97ec8fac1caee78fe7fe05306261e070
    439 Need man page for timegm()
commit 5335409b2fd9c9c1d570d3e83bd2386dd8f526de
    6001 strcat(9f) needs a manpage
commit b6dd77d465d357e7777305038b5579625ae268c1
    6726 ctype(3C): missing description for isxdigit_l
commit aa9ab05c0bbc3211e983fe34e9174559f1462665
    4704 thr_sigsetmask(3c): Minor typos in the man page
commit efbf89fbc68a0864d303fe237fc420cf018d52f7
    6497 nvlist_empty() needs to appear in man pages
commit a6ae009119d792a981d8b7153f8cb3851fe04ebb
    6471 avl_remove(9F) man page is needed
commit 79192153bee37eb85baa06695c8a483f93466f71
    6489 atomic_bits(3C) should list atomic_ops(3C) in See Also
commit 22f7b4012dd9e585f59664dcaf9573289230d516
    6241 Minor typo in mount_nfs(1m) man page
commit 4bfcae809e209680a47fe4a1a1d2ed8f5ad0790f
    6693 mdoc(5): typos in MT-LEVEL names
commit 44f88c2eeb6a7c329d82467a31c4a501eae16fec
    6721 tran_setup_pkt(9E) returns int, not a pointer
commit 4854f07f374eaa71835ef1badc7ba55466f85ef9
    6718 tran_tgt_init(9E) returns int, not void
commit 979eca435dd26bdb0460d501038ad90a972807d1
    6783 ddi_fm_service_impact has wrong synopsis
commit 7bc870e686dc02eed8049c71d916e03f1c233a1a
    6753 remove acpi_fw.h
commit e5b33823e7efd785e2f2ada4683abdef7c2a436c
    6817 libbe should not free string from nvlist_lookup_string()
commit e4cb59f791c5c6dea7ad4caa6dee845024ce71ef
    6781 zpool man page needs updated to remove duplicate entry of "cannot be" where it discusses cache devices
commit 63d0f4f15e0d9605137029897b712a2774ed7fa8
    6746 startup_bios_disk() should not be built for xpv
commit 797f979d1fe26bfb1cdeb3e7a86ed24c0b654200
    6684 Allow sending from IPv6 SLAAC addresses within a zone using IP spoofing protection

	Conflicts:
	usr/src/man/man9f/Makefile
	usr/src/uts/common/io/mac/mac_protect.c

6 files changed, 63 insertions, 59 deletions

diff --git a/usr/src/man/man3c/Makefile b/usr/src/man/man3c/Makefile
index 517fd867d0..049e767a7a 100644
--- a/usr/src/man/man3c/Makefile
+++ b/usr/src/man/man3c/Makefile
@@ -1213,6 +1213,7 @@ MANLINKS=	FD_CLR.3c				\
 	 	thr_setconcurrency.3c			\
 	 	thr_setprio.3c				\
 	 	thr_setspecific.3c			\
+		timegm.3c				\
 	 	timer_getoverrun.3c			\
 	 	timer_gettime.3c			\
 	 	timerclear.3c				\
@@ -2250,6 +2251,8 @@ thr_setspecific.3c			:= LINKSRC = thr_keycreate.3c
 
 thr_continue.3c				:= LINKSRC = thr_suspend.3c
 
+timegm.3c				:= LINKSRC = mktime.3c
+
 timer_getoverrun.3c			:= LINKSRC = timer_settime.3c
 timer_gettime.3c			:= LINKSRC = timer_settime.3c
 
diff --git a/usr/src/man/man3c/atomic_bits.3c b/usr/src/man/man3c/atomic_bits.3c
index 41edc51bfe..34ac0a78fa 100644
--- a/usr/src/man/man3c/atomic_bits.3c
+++ b/usr/src/man/man3c/atomic_bits.3c
@@ -3,7 +3,7 @@
 .\" 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]
-.TH ATOMIC_BITS 3C "May 13, 2005"
+.TH ATOMIC_BITS 3C "Mar 13, 2016"
 .SH NAME
 atomic_bits, atomic_set_long_excl, atomic_clear_long_excl \- atomic set and
 clear bit operations
@@ -21,7 +21,6 @@ clear bit operations
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBatomic_set_long_excl()\fR and \fBatomic_clear_long_excl()\fR functions
 perform an exclusive atomic bit set or clear operation on \fItarget\fR. The
@@ -30,17 +29,14 @@ target. Bits are numbered from zero to one less than the maximum number of bits
 in a \fBlong\fR. If the value of bit falls outside of this range, the result of
 the operation is undefined.
 .SH RETURN VALUES
-.sp
 .LP
 The \fBatomic_set_long_excl()\fR and \fBatomic_clear_long_excl()\fR functions
 return 0 if \fIbit\fR was successfully set or cleared. They return -1 if
 \fIbit\fR was already set or cleared.
 .SH ERRORS
-.sp
 .LP
 No errors are defined.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -58,9 +54,8 @@ MT-Level	MT-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBatomic_add\fR(3C), \fBatomic_and\fR(3C), \fBatomic_cas\fR(3C),
-\fBatomic_dec\fR(3C), \fBatomic_inc\fR(3C), \fBatomic_or\fR(3C),
-\fBatomic_swap\fR(3C), \fBmembar_ops\fR(3C), \fBattributes\fR(5),
-\fBatomic_ops\fR(9F)
+\fBatomic_dec\fR(3C), \fBatomic_inc\fR(3C), \fBatomic_ops\fR(3C),
+\fBatomic_or\fR(3C), \fBatomic_swap\fR(3C), \fBmembar_ops\fR(3C),
+\fBattributes\fR(5)
diff --git a/usr/src/man/man3c/ctype.3c b/usr/src/man/man3c/ctype.3c
index 5d5435f221..f8a0cc044b 100644
--- a/usr/src/man/man3c/ctype.3c
+++ b/usr/src/man/man3c/ctype.3c
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright 2014 Garrett D'Amore <garrett@damore.org>
+.\" Copyright 2016 Joyent, Inc.
 .\" Copyright 1989 AT&T.  Copyright (c) 1992, X/Open Company Limited  All Rights Reserved.  Portions Copyright (c) 2005, Sun Microsystems, Inc.  All Rights Reserved.
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
 .\" http://www.opengroup.org/bookstore/.
@@ -8,12 +9,12 @@
 .\" 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]
-.TH CTYPE 3C "Jun 27, 2014"
+.TH CTYPE 3C "Mar 14, 2016"
 .SH NAME
 ctype, isalpha, isalnum, isascii, isblank, iscntrl, isdigit, islower,
 isprint, isspace, isupper, ispunct, isgraph, isxdigit, isalpha_l,
 isalnum_l, isblank_l, iscntrl_l, isdigit_l, islower_l, isprint_l,
-isspace_l, isupper_l, ispunct_l, isgraph_l \- character handling
+isspace_l, isupper_l, ispunct_l, isgraph_l isxdigit_l \- character handling
 .SH SYNOPSIS
 .LP
 .nf
@@ -113,6 +114,10 @@ isspace_l, isupper_l, ispunct_l, isgraph_l \- character handling
 .nf
 \fBint\fR \fBisupper_l\fR(\fBint\fR \fIc\fR, \fBlocale_t\fR \fIloc\fR);
 .fi
+.LP
+.nf
+\fBint\fR \fBisxdigit_l\fR(\fBint\fR \fIc\fR, \fBlocale_t\fR \fIloc\fR);
+.fi
 .SH DESCRIPTION
 .LP
 These functions classify character-coded integer values. Each is a
@@ -126,12 +131,12 @@ characters are classified according to the rules of the \fBUS-ASCII\fR
 7-bit coded character set.
 .LP
 The functions \fBisalnum_l()\fR, \fBisalpha_l()\fR, \fBisblank_l()\fR,
-\fBiscntrl_l\fR, \fBisdigit_l()\fR, \fBislower_l()\fR,
-\fBisprint_l()\fR, \fBispunct_l()\fR, \fBisspace_l()\fR,
-\fBisupper_l()\fR, all behave identically to their counterparts without
-the '\fB_l\fR' prefix, except that instead of acting on the current
-locale, that perform the test on the locale specified in the argument
-\fIloc\fR.
+\fBiscntrl_l\fR, \fBisdigit_l()\fR, \fBisgraph_l()\fr,
+\fBislower_l()\fR, \fBisprint_l()\fR, \fBispunct_l()\fR,
+\fBisspace_l()\fR, \fBisupper_l()\fR, and \fBisxdigit_l()\fR all behave
+identically to their counterparts without the '\fB_l\fR' prefix, except
+that instead of acting on the current locale, they perform the test on
+the locale specified in the argument \fIloc\fR.
 .LP
 The \fBisascii()\fR macro is defined on all integer values. The rest are
 defined only where the argument is an \fBint\fR, the value of which is
@@ -294,7 +299,6 @@ the function, the result is undefined. Otherwise, the macro or function returns
 non-zero if the classification is \fBTRUE\fR and \fB0\fR if the classification
 is \fBFALSE\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .TS
diff --git a/usr/src/man/man3c/mktime.3c b/usr/src/man/man3c/mktime.3c
index 33ade2440d..e3caabf297 100644
--- a/usr/src/man/man3c/mktime.3c
+++ b/usr/src/man/man3c/mktime.3c
@@ -1,5 +1,6 @@
 '\" te
 .\" Copyright (c) 2003, Sun Microsystems, Inc.  All Rights Reserved.
+.\" Copyright 2016 Joyent, Inc.
 .\" Copyright 1989 AT&T
 .\" Portions Copyright (c) 2001, the Institute of Electrical and Electronics Engineers, Inc. and The Open Group. All Rights Reserved.
 .\" Sun Microsystems, Inc. gratefully acknowledges The Open Group for permission to reproduce portions of its copyrighted documentation. Original documentation from The Open Group can be obtained online at
@@ -9,9 +10,9 @@
 .\" 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]
-.TH MKTIME 3C "Nov 1, 2003"
+.TH MKTIME 3C "Mar 14, 2016"
 .SH NAME
-mktime \- converts a tm structure to a calendar time
+mktime, timegm \- convert a tm structure to a calendar time
 .SH SYNOPSIS
 .LP
 .nf
@@ -19,9 +20,12 @@ mktime \- converts a tm structure to a calendar time
 
 \fBtime_t\fR \fBmktime\fR(\fBstruct tm *\fR\fItimeptr\fR);
 .fi
+.LP
+.nf
+\fBtime_t\fR \fBtimegm\fR(\fBstruct tm *\fR\fItimeptr\fR);
+.fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBmktime()\fR function converts the time represented by the \fBtm\fR
 structure pointed to by \fItimeptr\fR into a calendar time  (the number of
@@ -81,17 +85,22 @@ specified time.
 .LP
 Local timezone information is used as if \fBmktime()\fR had called
 \fBtzset()\fR. See \fBctime\fR(3C).
-.SH RETURN VALUES
 .sp
 .LP
-If the calendar time can be represented in an object of type \fBtime_t\fR,
-\fBmktime()\fR returns the specified calendar time without changing
-\fBerrno\fR. If the calendar time cannot be represented, the function returns
-the value (\fBtime_t\fR)\(mi1 and sets \fBerrno\fR to indicate the error.
+The \fBtimegm()\fR function is identical to the \fBmktime()\fR function,
+except that the \fBtimegm()\fR function ignores both the current time
+zone and the \fBtm_isdst\fR member and operates as though the time zone
+were set to UTC.
+.SH RETURN VALUES
+.LP
+If the calendar time can be represented in an object of type
+\fBtime_t\fR, the \fBmktime()\fR and \fBtimegm()\fR functions return the
+specified calendar time without changing \fBerrno\fR. If the calendar
+time cannot be represented, the function returns the value
+(\fBtime_t\fR)\(mi1 and sets \fBerrno\fR to indicate the error.
 .SH ERRORS
-.sp
 .LP
-The \fBmktime()\fR function will fail if:
+The \fBmktime()\fR and \fBtimegm()\fR functions will fail if:
 .sp
 .ne 2
 .na
@@ -104,22 +113,23 @@ to the standards specify a different value.
 .RE
 
 .SH USAGE
-.sp
 .LP
-The  \fBmktime()\fR function is MT-Safe in multithreaded applications, as long
-as no user-defined function directly modifies one of the following variables:
-\fBtimezone\fR, \fBaltzone\fR, \fBdaylight\fR, and \fBtzname\fR. See
-\fBctime\fR(3C).
+The \fBmktime()\fR and \fBtimegm()\fR functions are MT-Safe in
+multithreaded applications, as long as no user-defined function directly
+modifies one of the following variables: \fBtimezone\fR, \fBaltzone\fR,
+\fBdaylight\fR, and \fBtzname\fR. See \fBctime\fR(3C).
 .sp
 .LP
-Note that \(mi1 can be a valid return value for the time that is one second
-before the Epoch.  The user should clear \fBerrno\fR before calling
-\fBmktime()\fR. If \fBmktime()\fR then returns \(mi1, the user should check
-\fBerrno\fR to determine whether or not an error actually occurred.
+Note that \(mi1 can be a valid return value for the time that is one
+second before the Epoch.  The user should clear \fBerrno\fR before
+calling \fBmktime()\fR and \fBtimegm()\fR. If \fBmktime()\fR or
+\fBtimegm()\fR then returns \(mi1, the user should check \fBerrno\fR to
+determine whether or not an error actually occurred.
 .sp
 .LP
-The  \fBmktime()\fR function assumes Gregorian dates. Times before the adoption
-of the Gregorian calendar will not match historial records.
+The \fBmktime()\fR and \fBtimegm()\fR functions assume Gregorian dates.
+Times before the adoption of the Gregorian calendar will not match
+historial records.
 .SH EXAMPLES
 .LP
 \fBExample 1 \fRSample code using \fBmktime()\fR.
@@ -152,15 +162,13 @@ printf("%s\en", wday[time_str.tm_wday]);
 .in -2
 
 .SH BUGS
-.sp
 .LP
 The \fBzoneinfo\fR timezone data files do not transition past Tue Jan 19
 03:14:07 2038 UTC.  Therefore for 64-bit applications using \fBzoneinfo\fR
 timezones, calculations beyond this date may not use the correct offset from
 standard time, and could return incorrect values. This affects the 64-bit
-version of \fBmktime()\fR.
+versions of \fBmktime()\fR and \fBtimegm()\fR.
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -178,7 +186,6 @@ MT-Level	MT-Safe with exceptions
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBctime\fR(3C), \fBgetenv\fR(3C), \fBTIMEZONE\fR(4), \fBattributes\fR(5),
 \fBstandards\fR(5)
diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c
index 882705284d..25207eb151 100644
--- a/usr/src/man/man3c/string.3c
+++ b/usr/src/man/man3c/string.3c
@@ -13,7 +13,7 @@
 .\" 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]
-.TH STRING 3C "Sep 14, 2015"
+.TH STRING 3C "Mar 23, 2016"
 .SH NAME
 string, strcasecmp, strcasecmp_l, strncasecmp, strncasecmp_l, strcat, strncat,
 strlcat, strchr, strchrnul, strrchr, strcmp, strncmp, stpcpy, stpncpy, strcpy,
@@ -232,11 +232,12 @@ the current locale, they instead operate in the locale specified by \fIloc\fR.
 .LP
 The \fBstrcat()\fR function appends a copy of string \fIs2\fR, including the
 terminating null character, to the end of string \fIs1\fR. The \fBstrncat()\fR
-function appends at most \fIn\fR characters. Each returns a pointer to the
-null-terminated result. The initial character of  \fIs2\fR overrides the null
-character at the end of \fIs1\fR. If copying takes place between objects that
-overlap, the behavior of \fBstrcat()\fR, \fBstrncat()\fR, and \fBstrlcat()\fR
-is undefined.
+function appends at most \fIn\fR characters of \fIs2\fR to \fIs1\fR, not
+including any terminating null character, and then appends a null character.
+Each returns a pointer to the null-terminated result. The initial character of
+\fIs2\fR overrides the null character at the end of \fIs1\fR. If copying takes
+place between objects that overlap, the behavior of \fBstrcat()\fR,
+\fBstrncat()\fR, and \fBstrlcat()\fR is undefined.
 .LP
 The \fBstrlcat()\fR function appends  at most
 (\fIdstsize\fR-\fBstrlen\fR(\fIdst\fR)-1) characters of \fIsrc\fR to \fIdst\fR
diff --git a/usr/src/man/man3c/thr_sigsetmask.3c b/usr/src/man/man3c/thr_sigsetmask.3c
index 716bb424eb..9689a5dc0e 100644
--- a/usr/src/man/man3c/thr_sigsetmask.3c
+++ b/usr/src/man/man3c/thr_sigsetmask.3c
@@ -10,7 +10,7 @@
 .\" 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]
-.TH THR_SIGSETMASK 3C "Mar 23, 2005"
+.TH THR_SIGSETMASK 3C "Mar 13, 2016"
 .SH NAME
 thr_sigsetmask \- change or examine calling thread's signal mask
 .SH SYNOPSIS
@@ -24,7 +24,6 @@ cc -mt [ \fIflag\fR... ] \fIfile\fR... [ \fIlibrary\fR... ]
 .fi
 
 .SH DESCRIPTION
-.sp
 .LP
 The \fBthr_sigsetmask()\fR function changes or examines a calling thread's
 signal mask. Each thread has its own signal mask. A new thread inherits the
@@ -32,7 +31,7 @@ calling thread's signal mask and priority; however, pending signals are not
 inherited. Signals pending for a new thread will be empty.
 .sp
 .LP
-If the value of the argument \fIset\fR is not  \fINULL,\fR \fBset\fR points to
+If the value of the argument \fIset\fR is not  \fINULL,\fR \fIset\fR points to
 a set of signals that can modify the currently blocked set. If the value of
 \fIset\fR is \fINULL\fR, the value of \fIhow\fR is insignificant and the
 thread's signal mask is unmodified; thus, \fBthr_sigsetmask()\fR can be used to
@@ -68,7 +67,7 @@ from the current signal mask.
 .ad
 .RS 15n
 \fIset\fR corresponds to the new signal mask. The current signal mask is
-replaced by \fBset\fR.
+replaced by \fIset\fR.
 .RE
 
 .sp
@@ -76,12 +75,10 @@ replaced by \fBset\fR.
 If the value of \fIoset\fR is not \fINULL\fR, it points to the location where
 the previous signal mask is stored.
 .SH RETURN VALUES
-.sp
 .LP
 Upon successful completion, the \fBthr_sigsetmask()\fR function returns
 \fB0\fR. Otherwise, it returns a non-zero value.
 .SH ERRORS
-.sp
 .LP
 The \fBthr_sigsetmask()\fR function will fail if:
 .sp
@@ -290,7 +287,6 @@ thread can be used by passing the argument \fBTHR_DAEMON\fR to
 \fBthr_create()\fR.
 
 .SH ATTRIBUTES
-.sp
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
 .sp
@@ -306,7 +302,6 @@ MT-Level	MT-Safe and Async-Signal-Safe
 .TE
 
 .SH SEE ALSO
-.sp
 .LP
 \fBsigaction\fR(2), \fBsigprocmask\fR(2), \fBsigwait\fR(2),
 \fBcond_wait\fR(3C), \fBpthread_cancel\fR(3C), \fBpthread_create\fR(3C),
@@ -314,7 +309,6 @@ MT-Level	MT-Safe and Async-Signal-Safe
 \fBsigemptyset\fR(3C), \fBsigsetops\fR(3C), \fBsleep\fR(3C),
 \fBattributes\fR(5), \fBcancellation\fR(5), \fBstandards\fR(5)
 .SH NOTES
-.sp
 .LP
 It is not possible to block signals that cannot be caught or ignored (see
 \fBsigaction\fR(2)). It is also not possible to block or unblock
@@ -334,7 +328,7 @@ blocks waiting for signals, the blocking thread cannot receive a synchronously
 generated signal.
 .sp
 .LP
-Calling the\fBsigprocmask\fR(2) function will be the same as if
+Calling the \fBsigprocmask\fR(2) function will be the same as if
 \fBthr_sigsetmask()\fR or \fBpthread_sigmask()\fR has been called. POSIX leaves
 the semantics of the call to \fBsigprocmask\fR(2) unspecified in a
 multi-threaded process, so programs that care about POSIX portability should