Merge remote-tracking branch 'origin/stable/10' into devel

4 files changed, 31 insertions, 19 deletions

diff --git a/share/man/man4/mlx5en.4 b/share/man/man4/mlx5en.4
index 03bb02c..e1b2b6d 100644
--- a/share/man/man4/mlx5en.4
+++ b/share/man/man4/mlx5en.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 22, 2015
+.Dd December 3, 2015
 .Dt mlx5en 4
 .Os
 .Sh NAME
@@ -40,6 +40,12 @@ kernel configuration file:
 .Cd "device mlx5en"
 .Ed
 .Pp
+To load the driver as a module at run-time,
+run the following command as root:
+.Bd -literal -offset indent
+kldload mlx5en
+.Ed
+.Pp
 To load the driver as a
 module at boot time, place the following lines in
 .Xr loader.conf 5 :
diff --git a/share/man/man7/tests.7 b/share/man/man7/tests.7
index e8e216a..22bf7df 100644
--- a/share/man/man7/tests.7
+++ b/share/man/man7/tests.7
@@ -26,20 +26,22 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 13, 2014
+.Dd December 5, 2015
 .Dt TESTS 7
 .Os
 .Sh NAME
 .Nm tests
-.Nd introduction to the FreeBSD Test Suite
+.Nd introduction to the
+.Fx
+Test Suite
 .Sh DESCRIPTION
 The
 .Fx
 Test Suite provides a collection of automated tests for two major purposes.
 On one hand, the test suite aids
 .Em developers
-to detect bugs and regressions when they modify the source tree.  On the other
-hand, it allows
+to detect bugs and regressions when they modify the source tree.
+On the other hand, it allows
 .Em end users
 (and, in particular, system administrators) to verify that fresh installations
 of the
@@ -164,23 +166,26 @@ Test Suite:
 .Bl -tag -width "allow_sysctl_side_effects"
 .It allow_devfs_side_effects
 If defined, enables tests that may destroy and recreate semipermanent device
-nodes, like disk devices.  Without this variable, tests may still create and
-destroy devices nodes that are normally transient, like /dev/tap* and
-/dev/pts*, as long as they clean them up afterwards.  However, tests that
-require this variable have a relaxed cleanup requirement; they must recreate
-any devices that they destroyed, but not necessarily with the same devnames.
+nodes, like disk devices.
+Without this variable, tests may still create and destroy devices nodes that
+are normally transient, like /dev/tap* and /dev/pts*, as long as they clean
+them up afterwards.
+However, tests that require this variable have a relaxed cleanup requirement;
+they must recreate any devices that they destroyed, but not necessarily with
+the same devnames.
 .It allow_sysctl_side_effects
 Enables tests that change globally significant
 .Xr sysctl 8
-variables.  The tests will undo any changes in their cleanup phases.
+variables.
+The tests will undo any changes in their cleanup phases.
 .It disks
-Must be set to a space delimited list of disk device nodes.  Tests that need
-destructive access to disks must use these devices.  Tests are not required to
-preserve any data present on these disks.
+Must be set to a space delimited list of disk device nodes.
+Tests that need destructive access to disks must use these devices.
+Tests are not required to preserve any data present on these disks.
 .It fibs
-Must be set to a space delimited list of FIBs (routing tables).  Tests that
-need to modify a routing table may use any of these.  Tests will cleanup any
-new routes that they create.
+Must be set to a space delimited list of FIBs (routing tables).
+Tests that need to modify a routing table may use any of these.
+Tests will cleanup any new routes that they create.
 .El
 .Ss What to do if something fails?
 If there is
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index ec6c699..a6a13fd 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -889,6 +889,7 @@ MLINKS+=\
 	mbuf.9 m_cat.9 \
 	mbuf.9 MCHTYPE.9 \
 	mbuf.9 MCLGET.9 \
+	mbuf.9 m_collapse.9 \
 	mbuf.9 m_copyback.9 \
 	mbuf.9 m_copydata.9 \
 	mbuf.9 m_copym.9 \
diff --git a/share/man/man9/g_bio.9 b/share/man/man9/g_bio.9
index e7351b8..76f7611 100644
--- a/share/man/man9/g_bio.9
+++ b/share/man/man9/g_bio.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 1, 2006
+.Dd December 7, 2015
 .Dt G_BIO 9
 .Os
 .Sh NAME
@@ -253,7 +253,7 @@ example_start(struct bio *bp)
 	/* Ok, schedule it down. */
 	/*
 	 * The consumer can be obtained from
-	 * LIST_FIRST(&bp->bio_to->geom->consumers) as well,
+	 * LIST_FIRST(&bp->bio_to->geom->consumer) as well,
 	 * if there is only one in our geom.
 	 */
 	g_io_request(cbp, sc->ex_consumer);