[illumos-gate merge]release-20170608

commit 79809f9cf402f130667349b2d4007ecd65d63c6f
    8269 dtrace stddev aggregation is normalized incorrectly
commit 22c8b9583d07895c16549075a53668d7bc988cf3
    8108 zdb -l fails to read labels 2 and 3
commit 0255edcc85fc0cd1dda0e49bcd52eb66c06a1b16
    8056 zfs send size estimate is inaccurate for some zvols
commit dbfd9f930004c390a2ce2cf850c71b4f880eef9c
    8156 dbuf_evict_notify() does not need dbuf_evict_lock
commit 690031d326342fa4ea28b5e80f1ad6a16281519d
    8168 NULL pointer dereference in zfs_create()
commit 7c4ab494ff60bbbcc0889e71388ae63e903bbf57
    8276 rpcbind leaks memory due to libumem per thread caching.
commit f176a0a4cd61cbd708a7f25dc30d221f4d5902ba
    8270 dnlc_reverse_lookup() is unsafe at any speed
commit 72d3dbb9ab4481606cb93caca98ba3b3a8eb6ce2
    8300 fix man page issues found by mandoc 1.14.1
commit cb4d790db8fe85bce9f9647fe4e1bdc274c7af1c
    8337 gss: misleading-indentation
commit f53522305c07915a44e86f2455cc62e7aac27037
    8324 more: misleading-indentation

	Conflicts:
	usr/src/uts/common/fs/lookup.c
	usr/src/man/man3c/thrd_equal.3c

1 files changed, 9 insertions, 8 deletions

diff --git a/usr/src/man/man9f/mac_link_update.9f b/usr/src/man/man9f/mac_link_update.9f
index a7a460dab0..f37990c3c3 100644
--- a/usr/src/man/man9f/mac_link_update.9f
+++ b/usr/src/man/man9f/mac_link_update.9f
@@ -32,8 +32,8 @@ illumos DDI specific
 The MAC handle obtained from a call to
 .Xr mac_register 9F .
 .It Fa link
-The current state of the link. For valid link states see the discussion
-of
+The current state of the link.
+For valid link states see the discussion of
 .Sy MAC_PROP_STATUS
 in the
 .Sx PROPERTIES
@@ -44,16 +44,17 @@ section of
 The
 .Fn mac_link_update
 function is used by device drivers to inform the MAC layer that the
-state of a link has changed. As discussed in the
+state of a link has changed.
+As discussed in the
 .Sx Link Updates
 section of
 .Xr mac 9E ,
 the driver should call this whenever it detects that the state of the
-link has changed. If the state has not changed, then the driver should
-not call this function. In addition, if the device driver is powering
-off the link or is transitioning to a state where it can no longer
-determine the link status, then it should make sure to call this
-function with the value of
+link has changed.
+If the state has not changed, then the driver should not call this function.
+In addition, if the device driver is powering off the link or is transitioning
+to a state where it can no longer determine the link status, then it should make
+sure to call this function with the value of
 .Fa link
 set to
 .Sy LINK_STATE_UNKNOWN .