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

diff --git a/usr/src/man/man7d/xhci.7d b/usr/src/man/man7d/xhci.7d
index e2822fd19c..4f2836b97e 100644
--- a/usr/src/man/man7d/xhci.7d
+++ b/usr/src/man/man7d/xhci.7d
@@ -23,9 +23,9 @@
 The
 .Nm
 driver supports PCI devices that implement versions 1.0 and 1.1 of the
-Extensible Host Controller Inteface Specification. These devices provide
-support for USB 3.0, USB 2.x, and USB 1.x devices and is integrated into
-the broader illumos USB Architecture (USBA).
+Extensible Host Controller Inteface Specification.
+These devices provide support for USB 3.0, USB 2.x, and USB 1.x devices and is
+integrated into the broader illumos USB Architecture (USBA).
 .Pp
 The
 .Nm
@@ -38,15 +38,16 @@ and
 .Pp
 Administrators do not interact with the
 .Nm
-driver directly. USB devices are managed with
+driver directly.
+USB devices are managed with
 .Xr cfgadm 1M .
 See
 .Xr cfgadm_usb 1M
 for more information on how to specifically manage USB devices and how
 they are laid out in the system.
 .Xr cfgadm 1M
-is only used to manage devices at a USB level. For example, a USB NIC
-would still be managed with
+is only used to manage devices at a USB level.
+For example, a USB NIC would still be managed with
 .Xr dladm 1M
 at a networking level.
 .Pp
@@ -54,15 +55,16 @@ On some x86 systems USB ports may be routed to either an instance of the
 .Nm
 driver or an instance of the
 .Xr ehci 7D
-driver. By default, all such ports are routed to the
+driver.
+By default, all such ports are routed to the
 .Nm
 driver, allowing those devices to operate at USB 3.x speed by default.
-This is most common on Intel platforms and chipsets. While this is
-controlled with the
+This is most common on Intel platforms and chipsets.
+While this is controlled with the
 .Sy xhci-reroute
 property discussed below, changing it may not be sufficient to change
-the behavior. The BIOS or ACPI data for many x86 systems may toggle this
-automatically.
+the behavior.
+The BIOS or ACPI data for many x86 systems may toggle this automatically.
 .Sh PROPERTIES
 The
 .Nm
@@ -77,8 +79,9 @@ The
 .Sy xhci-reroute
 property determines whether or not USB ports are re-routed to the
 .Nm
-driver. The default behavior is to route such ports.  To disable this,
-the property should be set to
+driver.
+The default behavior is to route such ports.
+To disable this, the property should be set to
 .Sy 0 .
 Any other value, or the lack of the property, cause the default behavior
 to take place.