MFstable10 r274102:
  MFC r274095:
  Fix VOLUME_LABEL when BRANCH contains '-' and '.'
  characters.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation
[SA-14:25] Fix kernel stack disclosure in setlogin(2) / getlogin(2).
[SA-14:26] Fix remote command execution in ftp(1).

Approved by:	re (gjb)
MFC r274128:

Add the less-ambiguous freebsd-version command.

Approved by:	re
Document SA-14:25, SA-14:26

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
MFstable10 273998:
Rework the EXAMPLES section to be a bit clearer.
- Add an example of using etcupdate diff.
- Create a subsection on bootstrapping that is below the simple
  examples.  This should make it clearer that 'etcupdate extract' is
  a one-time operation and not part of the common workflow.  It also
  adds more suggestions on when bootstrapping is needed and additional
  steps to make future merges simpler.

Approved by:	re (delphij)
Update the Intel ixl/ixlv drivers to fix a panic in the boot/install
kernel if the system has a fiber-based Intel XL710 adapter installed.

In addition ixl version 1.2.8 and ixlv version 1.1.18 give:
  - Improved VF stability (thanks to Ryan Stone for this)
  - RSS fixes
  - link detection in the ixlv driver
  - new sysctl's added
  - corrected media reporting

Submitted by: jfv
Approved by: re
Document incompatibility between bsdconfig(8) and
pkg(8) in 10.1-RELEASE, and provide steps to install
the on-disc packages via alternative method.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
Update releng/10.1 to -RELEASE status, and prepare
for final 10.1-RELEASE builds.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
Merge branch 'releng/10.1' of https://github.com/freebsd/freebsd into releng/10.1

Conflicts:
	sys/conf/newvers.sh
Merge branch 'releng/10.1' of github.com:pcbsd/freebsd into releng/10.1