[illumos-gate merge]

commit 7ab4e62e3b5c454f248a38bec0d489e8f5543324
    3346 svc-hostid uses perl stupidly
commit 95c635efb7c3b86efc493e0447eaec7aecca3f0f
    5025 import and use mandoc
commit 81d43577d1b5e76e6016ba642ecc1a76fde43021
    5004 load average should be virtualized for zones
commit 944b13ecd074fe0d43ed6f80c816ca862c3cd6eb
    4956 zonecfg won't use a valid pager
commit e03914f9208eb53e6c8a6d5a436953ad983642b0
    4696 allowed-ips should let you specify prefixes
commit 31c6d826a7f7a4ee7d83c8e99f25d82a4a248076
    4922 all calloc() implementations should check for overflow
commit d9c5840bd764434fd93f85a52eb4cbc24bff03da
    4959 completely discarded merged string sections will corrupt output objects
commit 2e4c998613148111f2fc5371085331ffb39122ff
    4976 zfs should only avoid writing to a failing non-redundant top-level vdev
    4977 mdb error in ::spa_space from space_cb() if a metaslab's ms_sm is NULL
    4978 ztest fails in get_metaslab_refcount()
    4979 extend free space histogram to device and pool
    4980 metaslabs should have a fragmentation metric
    4981 remove fragmented ops vector from block allocator
    4982 space_map object should proactively upgrade when feature is enabled
    4983 need to collect metaslab information via mdb
    4984 device selection should use fragmentation metric
commit 1a41ca239310955ae95b2569b707432432a58580
    5013 add support for multiple mac addresses per client
commit 680047a5d0ef56480110f0de516145ba0efd5caa
    474 tcp_strong_iss should be 2 instead of 1 (missing file)
commit 6400a6be1817a40f3dbefdd3df7b7d87bcebef30
    474 tcp_strong_iss should be 2 instead of 1
commit dcb12fb726d8dd4ff80ea255dc3f53b5692c75e5
    5014 etherstubs confuse min mtu with min sdu
commit c9030f6c93613fe30ee0c16f92b96da7816ac052
    5008 lock contention (rrw_exit) while running a read only load

Conflicts:
	usr/src/uts/common/sys/zone.h
	usr/src/uts/common/sys/vnic_impl.h
	usr/src/uts/common/sys/mac.h
	usr/src/uts/common/os/zone.c
	usr/src/uts/common/io/vnic/vnic_dev.c
	usr/src/uts/common/io/mac/mac_protect.c
	usr/src/uts/common/io/mac/mac_client.c
	usr/src/tools/scripts/git-pbchk.py
	usr/src/tools/onbld/hgext/cdm.py
	usr/src/test/util-tests/tests/Makefile
	usr/src/pkg/manifests/developer-build-onbld.mf
	usr/src/man/man5/Makefile
	usr/src/lib/libdladm/common/linkprop.c
	usr/src/cmd/zonecfg/zonecfg.c
	usr/src/cmd/Makefile
	usr/src/man/man1/column.1
	usr/src/man/man1/crontab.1
	usr/src/man/man1m/dladm.1m
	usr/src/man/man1m/flowadm.1m
	usr/src/man/man1m/snoop.1m
	usr/src/man/man1m/vfsstat.1m
	usr/src/man/man1m/vndadm.1m
	usr/src/man/man1m/zfs.1m
	usr/src/man/man1m/zonecfg.1m
	usr/src/man/man1m/zpool.1m
	usr/src/man/man3c/epoll_create.3c
	usr/src/man/man3c/epoll_ctl.3c
	usr/src/man/man3c/epoll_wait.3c
	usr/src/man/man3lib/libvnd.3lib
	usr/src/man/man3vnd/vnd_frameio_read.3vnd
	usr/src/man/man3vnd/vnd_prop_get.3vnd
	usr/src/man/man3vnd/vnd_prop_iter.3vnd
	usr/src/man/man3vnd/vnd_walk.3vnd
	usr/src/man/man5/epoll.5
	usr/src/man/man7d/vnd.7d
	usr/src/man/man7fs/bootfs.7fs
	usr/src/man/man7fs/lxproc.7fs

Manifests:
	usr/src/pkg/manifests/text-doctools.mf
	usr/src/pkg/manifests/system-man.mf

16 files changed, 18 insertions, 39 deletions

diff --git a/usr/src/man/man3c/btowc.3c b/usr/src/man/man3c/btowc.3c
index 56dc9e19a2..8bdc513aaf 100644
--- a/usr/src/man/man3c/btowc.3c
+++ b/usr/src/man/man3c/btowc.3c
@@ -35,7 +35,7 @@ state.
 .LP
 The behavior of \fBbtowc()\fR is affected by the \fBLC_CTYPE\fR category of the
 current locale.  See \fBenviron\fR(5). The function \fBbtowc_l()\fR does
-not use the current locale, and instead operates on the locale 
+not use the current locale, and instead operates on the locale
 specified by \fIloc\fR.
 .SH RETURN VALUES
 .LP
diff --git a/usr/src/man/man3c/epoll_create.3c b/usr/src/man/man3c/epoll_create.3c
index 87d0a85c38..3dd9abf5f7 100644
--- a/usr/src/man/man3c/epoll_create.3c
+++ b/usr/src/man/man3c/epoll_create.3c
@@ -88,7 +88,6 @@ The maximum allowable number of files is currently open in the system.
 .RE
 
 .sp
-.LP
 .SH NOTES
 .sp
 .LP
@@ -98,7 +97,6 @@ compatibility for Linux-borne applications; native
 applications should continue to prefer using event ports via the
 \fBport_create\fR(3C), \fBport_associate\fR(3C) and \fBport_get\fR(3C)
 interfaces.  See \fBepoll\fR(5) for compatibility details and restrictions.
-.RE
 
 .SH SEE ALSO
 .sp
diff --git a/usr/src/man/man3c/epoll_ctl.3c b/usr/src/man/man3c/epoll_ctl.3c
index 0cce6affa4..ccf3139396 100644
--- a/usr/src/man/man3c/epoll_ctl.3c
+++ b/usr/src/man/man3c/epoll_ctl.3c
@@ -33,7 +33,7 @@ Valid values for \fIop\fR:
 \fBEPOLL_CTL_ADD\fR
 .ad
 .RS 12n
-For the \fBepoll\fR(5) instance specified by \fIepfd\fR, 
+For the \fBepoll\fR(5) instance specified by \fIepfd\fR,
 associate the file descriptor specified by \fIfd\fR with the event specified
 by \fIevent\fR.
 .RE
@@ -44,7 +44,7 @@ by \fIevent\fR.
 \fBEPOLL_CTL_DEL\fR
 .ad
 .RS 12n
-For the \fBepoll\fR(5) instance specified by \fIepfd\fR, 
+For the \fBepoll\fR(5) instance specified by \fIepfd\fR,
 remove all event associations for the file descriptor specified by \fIfd\fR.
 \fIevent\fR is ignored, and may be NULL.
 .RE
@@ -80,8 +80,8 @@ struct epoll_event {
 .in -4
 
 The \fIdata\fR field specifies the datum to
-be associated with the event and 
-will be returned via \fBepoll_wait\fR(3C).  
+be associated with the event and
+will be returned via \fBepoll_wait\fR(3C).
 The \fIevents\fR field denotes both the desired events (when specified via
 \fBepoll_ctl()\fR) and the events that have occurred (when returned via
 \fBepoll_wait\fR(3C)).
@@ -93,7 +93,6 @@ of any combination of the following event flags:
 .ne 2
 .na
 \fBEPOLLIN\fR
-.as
 .RS 14n
 Data other than high priority data may be read without blocking. For streams,
 this flag is set in the returned \fIevents\fR even if the message is of
@@ -104,7 +103,6 @@ zero length.
 .ne 2
 .na
 \fBEPOLLPRI\fR
-.as
 .RS 14n
 Normal data (priority band equals 0) may be read without blocking. For streams,
 this flag is set in the returned \fIevents\fR even if the message is of zero
@@ -115,7 +113,6 @@ length.
 .ne 2
 .na
 \fBEPOLLOUT\fR
-.as
 .RS 14n
 Normal data (priority band equals 0) may be written without blocking.
 .RE
@@ -124,7 +121,6 @@ Normal data (priority band equals 0) may be written without blocking.
 .ne 2
 .na
 \fBEPOLLRDNORM\fR
-.as
 .RS 14n
 Normal data (priority band equals 0) may be read without blocking. For streams,
 this flag is set in the returned \fIrevents\fR even if the message is of
@@ -135,7 +131,6 @@ zero length.
 .ne 2
 .na
 \fBEPOLLRDBAND\fR
-.as
 .RS 14n
 Data from a non-zero priority band may be read without blocking. For streams,
 this flag is set in the returned \fIrevents\fR even if the message is of
@@ -146,7 +141,6 @@ zero length.
 .ne 2
 .na
 \fBEPOLLWRNORM\fR
-.as
 .RS 14n
 The same as \fBEPOLLOUT\fR.
 .RE
@@ -155,7 +149,6 @@ The same as \fBEPOLLOUT\fR.
 .ne 2
 .na
 \fBEPOLLWRBAND\fR
-.as
 .RS 14n
 Priority data (priority band > 0) may be written.  This event only examines
 bands that have been written to at least once.
@@ -165,7 +158,6 @@ bands that have been written to at least once.
 .ne 2
 .na
 \fBEPOLLMSG\fR
-.as
 .RS 14n
 This exists only for backwards binary and source compatibility with Linux;
 it has no meaning and is ignored.
@@ -175,7 +167,6 @@ it has no meaning and is ignored.
 .ne 2
 .na
 \fBEPOLLERR\fR
-.as
 .RS 14n
 An error has occurred on the device or stream.  This flag is only valid in the
 returned \fIevents\fR field.
@@ -185,7 +176,6 @@ returned \fIevents\fR field.
 .ne 2
 .na
 \fBEPOLLHUP\fR
-.as
 .RS 14n
 A hangup has occurred on the stream. This event and \fBEPOLLOUT\fR are mutually
 exclusive; a stream can never be writable if a hangup has occurred. However,
@@ -200,7 +190,6 @@ in the \fIevents\fR field specified via \fBepoll_ctl()\fR.
 .ne 2
 .na
 \fBEPOLLRDHUP\fR
-.as
 .RS 14n
 The stream socket peer shutdown the writing half of the connection and no
 further data will be readable via the socket.  This event is not mutually
@@ -211,7 +200,6 @@ exclusive with \fBEPOLLIN\fR.
 .ne 2
 .na
 \fBEPOLLWAKEUP\fR
-.as
 .RS 14n
 This exists only for backwards binary and source compatibility with Linux;
 it has no meaning and is ignored.
@@ -221,7 +209,6 @@ it has no meaning and is ignored.
 .ne 2
 .na
 \fBEPOLLONESHOT\fR
-.as
 .RS 14n
 Sets the specified event to be in one-shot mode, whereby the event association
 with the \fBepoll\fR(5) instance specified by \fIepfd\fR is removed atomically
@@ -234,7 +221,6 @@ races inherent in multithreaded use of \fBepoll_wait\fR(3C).
 .ne 2
 .na
 \fBEPOLLET\fR
-.as
 .RS 14n
 Sets the specified event to be edge-triggered mode instead of the default
 mode of level-triggered.  In this mode, events will be induced by
@@ -296,7 +282,6 @@ specified \fBepoll\fR(5) instance.
 .RE
 
 .sp
-.LP
 .SH NOTES
 .sp
 .LP
@@ -306,7 +291,6 @@ compatibility for Linux-borne applications; native
 applications should continue to prefer using event ports via the
 \fBport_create\fR(3C), \fBport_associate\fR(3C) and \fBport_get\fR(3C)
 interfaces.  See \fBepoll\fR(5) for compatibility details and restrictions.
-.RE
 
 .SH SEE ALSO
 .sp
diff --git a/usr/src/man/man3c/epoll_wait.3c b/usr/src/man/man3c/epoll_wait.3c
index 6405c30b5d..670eebe89c 100644
--- a/usr/src/man/man3c/epoll_wait.3c
+++ b/usr/src/man/man3c/epoll_wait.3c
@@ -39,7 +39,7 @@ number of milliseconds to wait for an event if none is pending.  A
 \fItimeout\fR of -1 denotes an infinite timeout.
 
 The \fBepoll_pwait()\fR is similar to \fBepoll_wait()\fR, but takes an
-additional \fIsigmask\fR argument that specifies the desired signal mask 
+additional \fIsigmask\fR argument that specifies the desired signal mask
 when \fBepoll_pwait()\fR is blocked.  It is equivalent to atomically
 setting the signal mask, calling \fBepoll_wait()\fR, and restoring the
 signal mask upon return, and is therefore similar to the relationship
@@ -95,7 +95,6 @@ is not greater than zero.
 .RE
 
 .sp
-.LP
 .SH NOTES
 .sp
 .LP
@@ -105,11 +104,10 @@ compatibility for Linux-borne applications; native
 applications should continue to prefer using event ports via the
 \fBport_create\fR(3C), \fBport_associate\fR(3C) and \fBport_get\fR(3C)
 interfaces.  See \fBepoll\fR(5) for compatibility details and restrictions.
-.RE
 
 .SH SEE ALSO
 .sp
 .LP
 \fBepoll_create\fR(3C), \fBepoll_ctl\fR(3C),
-\fBport_create\fR(3C), \fBport_associate\fR(3C), \fBport_get\fR(3C), 
+\fBport_create\fR(3C), \fBport_associate\fR(3C), \fBport_get\fR(3C),
 \fBpselect\fR(3C), \fBepoll\fR(5)
diff --git a/usr/src/man/man3c/fgetwc.3c b/usr/src/man/man3c/fgetwc.3c
index 8b75c6cc55..6044683813 100644
--- a/usr/src/man/man3c/fgetwc.3c
+++ b/usr/src/man/man3c/fgetwc.3c
@@ -36,7 +36,7 @@ character (if present) from the input stream pointed to by \fIstream\fR,
 convert that to the corresponding wide-character code and advance the
 associated file position indicator for the stream (if defined).
 Whereas \fBfgetwc()\fR uses the current locale, \fBfgetwc_l()\fR uses the
-locale specified by \fIloc\R.
+locale specified by \fIloc\fR.
 .LP
 If an error occurs, the resulting value of the file position indicator for the
 stream is indeterminate.
diff --git a/usr/src/man/man3c/fopen.3c b/usr/src/man/man3c/fopen.3c
index 2eaaf4dd87..0dfdcb4cc0 100644
--- a/usr/src/man/man3c/fopen.3c
+++ b/usr/src/man/man3c/fopen.3c
@@ -34,7 +34,7 @@ base sequences:
 .sp
 .ne 2
 .na
-\fB\fBr\fR\fR 
+\fB\fBr\fR\fR
 .ad
 .RS 20n
 Open file for reading.
diff --git a/usr/src/man/man3c/iswctype.3c b/usr/src/man/man3c/iswctype.3c
index 9da9eef82a..d29414833e 100644
--- a/usr/src/man/man3c/iswctype.3c
+++ b/usr/src/man/man3c/iswctype.3c
@@ -42,7 +42,7 @@ These functions are defined on
 and wide-character codes corresponding to the valid character encodings in the
 current locale (or
 .I loc
-for 
+for
 .BR iswctype_l() .)
 If the
 .I wc
diff --git a/usr/src/man/man3c/mbrtowc.3c b/usr/src/man/man3c/mbrtowc.3c
index 55e053570e..60f54b1925 100644
--- a/usr/src/man/man3c/mbrtowc.3c
+++ b/usr/src/man/man3c/mbrtowc.3c
@@ -81,7 +81,7 @@ is a null pointer, these functions use their own
 internal
 .B mbstate_t
 object, which is initialized at program startup to the
-initial conversion state. Otherwise, the 
+initial conversion state. Otherwise, the
 .B mbstate_t
 object pointed to by
 .I ps
diff --git a/usr/src/man/man3c/mbsrtowcs.3c b/usr/src/man/man3c/mbsrtowcs.3c
index b645fe4942..f53f871343 100644
--- a/usr/src/man/man3c/mbsrtowcs.3c
+++ b/usr/src/man/man3c/mbsrtowcs.3c
@@ -135,7 +135,7 @@ The
 .B mbsnrtowcs()
 and
 .B mbsrtowcs()
-functions are Standard.  The 
+functions are Standard.  The
 .B mbsnrtowcs_l()
 and
 .B mbsrtowcs_l()
diff --git a/usr/src/man/man3c/newlocale.3c b/usr/src/man/man3c/newlocale.3c
index 7fa9048211..3f0c652d5a 100644
--- a/usr/src/man/man3c/newlocale.3c
+++ b/usr/src/man/man3c/newlocale.3c
@@ -76,7 +76,7 @@ An alternate name fo the locale "C".
 Indicates that the locale should be processed based in the values in the
 environment. See
 .BR setlocale (3C)
-and 
+and
 .BR environ (5)
 for more information.
 .LP
diff --git a/usr/src/man/man3c/strcoll.3c b/usr/src/man/man3c/strcoll.3c
index d1a3de385b..2cca905ec2 100644
--- a/usr/src/man/man3c/strcoll.3c
+++ b/usr/src/man/man3c/strcoll.3c
@@ -69,8 +69,6 @@ collating sequence.
 .SH FILES
 .IP \fB/usr/lib/locale/\fR\fIlocale\fR\fB/LC_COLLATE/*\fR
 collation database for \fIlocale\fR
-.RE
-
 .SH ATTRIBUTES
 .LP
 See \fBattributes\fR(5) for descriptions of the following attributes:
diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c
index cd2dacbedf..4c31ca5f81 100644
--- a/usr/src/man/man3c/string.3c
+++ b/usr/src/man/man3c/string.3c
@@ -174,7 +174,7 @@ versions of  \fBstrcmp()\fR and \fBstrncmp()\fR respectively, described below.
 The \fBstrcasecmp()\fR and \fBstrncasecmp()\fR functions compare two strings
 byte-by-byte, after
 converting each upper-case character to lower-case (as determined by the
-\fBLC_CTYPE\fR category of the current locale).  Note that neither the contents 
+\fBLC_CTYPE\fR category of the current locale).  Note that neither the contents
 pointed to by \fIs1\fR nor \fIs2\fR are modified.
 .LP
 The functions return an integer
diff --git a/usr/src/man/man3c/towlower.3c b/usr/src/man/man3c/towlower.3c
index e0024720b4..f642d222a0 100644
--- a/usr/src/man/man3c/towlower.3c
+++ b/usr/src/man/man3c/towlower.3c
@@ -26,7 +26,7 @@ towlower, towlower_l \- transliterate upper-case wide characters to lower-case
 .LP
 .nf
 \fBwint_t\fR \fBtowlower_l\fR(\fBwint_t\fR \fIwc\fR, \fBlocale_t\fR \fIloc\fR);
-.nf
+.fi
 .SH DESCRIPTION
 The function
 .BR towlower()
diff --git a/usr/src/man/man3c/uselocale.3c b/usr/src/man/man3c/uselocale.3c
index ca2d034c6e..a97bfec114 100644
--- a/usr/src/man/man3c/uselocale.3c
+++ b/usr/src/man/man3c/uselocale.3c
@@ -34,7 +34,7 @@ a thread is created, it uses the global locale as specified by calls to
 .LP
 If
 .BR (locale_t) 0
-is supplied for 
+is supplied for
 .IR loc ,
 then no change is made to the thread's locale setting.  This can be used
 to query the thread's locale without making any change.
diff --git a/usr/src/man/man3c/wcscoll.3c b/usr/src/man/man3c/wcscoll.3c
index f7d88a7519..59f8d18800 100644
--- a/usr/src/man/man3c/wcscoll.3c
+++ b/usr/src/man/man3c/wcscoll.3c
@@ -50,7 +50,7 @@ integer greater than, equal to, or less than 0, depending upon whether the wide
 character string pointed to by \fIws1\fR is greater than, equal to, or less
 than the wide character string pointed to by \fIws2\fR, when both are
 interpreted as appropriate to the the current locale, or the locale
-specified by \fIloc\fR. On error, 
+specified by \fIloc\fR. On error,
 they set \fBerrno\fR, but no return value is reserved to indicate an error.
 .SH ERRORS
 .LP
diff --git a/usr/src/man/man3c/wcsrtombs.3c b/usr/src/man/man3c/wcsrtombs.3c
index 4068427f8a..87c6f4c78e 100644
--- a/usr/src/man/man3c/wcsrtombs.3c
+++ b/usr/src/man/man3c/wcsrtombs.3c
@@ -24,6 +24,7 @@ wcsnrtombs, wcsnrtombs_l, wcsrtombs, wcsrtombs_l \- convert a wide-character str
 .nf
 \fBsize_t\fR \fBwcsnrtombs\fR(\fBchar *restrict\fR \fIdst\fR, \fBconst wchar_t **restrict\fR \fIsrc\fR,
      \fBsize_t\fR \fInwc\fR, \fBsize_t\fR \fIlen\fR, \fBmbstate_t *restrict\fR \fIps\fR);
+.fi
 .LP
 .nf
 #include <wchar.h>