[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, 13 insertions, 11 deletions

diff --git a/usr/src/man/man3c/pthread_mutexattr_getrobust.3c b/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
index cefcc73042..85b2b335c9 100644
--- a/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
+++ b/usr/src/man/man3c/pthread_mutexattr_getrobust.3c
@@ -46,23 +46,24 @@ include:
 .It Sy PTHREAD_MUTEX_STALLED
 The mutex referred to by
 .Va attr
-is a traditional mutex. When a thread holding an intra-process lock or a
-process holding an inter-process lock crashes or terminates without
-unlocking the mutex, then the lock will be
+is a traditional mutex.
+When a thread holding an intra-process lock or a process holding an
+inter-process lock crashes or terminates without unlocking the mutex, then the
+lock will be
 .Sy stalled .
 For another thread or process to obtain the lock, something else must
 unlock it.
 .It Sy PTHREAD_MUTEX_ROBUST
 The mutex referred to by
 .Va attr
-is considered a robust mutex. When a process holding an inter-process
-lock crashes or terminates without unlocking the mutex, the attempt to
-lock it will return
+is considered a robust mutex.
+When a process holding an inter-process lock crashes or terminates without
+unlocking the mutex, the attempt to lock it will return
 .Er EOWNERDEAD .
 This allows the new owner the chance to fix the internal state and call
 .Xr pthread_mutex_consistent 3C
-prior to unlocking the lock, allowing normal operation to proceed. Any
-crashes while in this state cause the next owner to obtain
+prior to unlocking the lock, allowing normal operation to proceed.
+Any crashes while in this state cause the next owner to obtain
 .Er EOWNERDEAD .
 .El
 .Sh RETURN VALUES
@@ -72,8 +73,8 @@ function will return
 .Sy 0
 and update
 .Fa robust
-with the current value of the robust attribute. Upon successful
-completion, the
+with the current value of the robust attribute.
+Upon successful completion, the
 .Fn pthread_mutexattr_setrobust
 function will return
 .Sy 0
@@ -82,7 +83,8 @@ and update the robust property of the attributes pointed to by
 to
 .Va robust .
 If either function fails, an error code will be returned to indicate the
-error. Valid errors are defined below.
+error.
+Valid errors are defined below.
 .Sh ERRORS
 The
 .Fn pthread_mutexattr_getrobust