MFS r273580: MFC r273577:

Return BUS_PROBE_DEFAULT instead of BUS_PROBE_VENDOR or 0 for in-tree
driver.  This change was verified by Microsoft.

Approved by:	re (kib)
Document r273399, OpenSSL updated to version 1.0.1j.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
Note to avoid using GENERIC kernel on i386 when using
multi-disk ZFS pools, referencing an old UPDATING entry
that predates 10.0-RELEASE.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
MFstable10 r273698:
MFC r273653:
  Fix a few issues with creating VOLUME_LABEL for the
  installation ISOs:

   - TYPE, BRANCH, and REVISION are only defined if
     OSRELEASE is not defined, so in situations where
     one might set OSRELEASE for an in-house ISO build,
     VOLUME_LABEL would be empty.

   - makefs(8) limits the volume label to 32 characters,
     which for the powerpc64 case, OSRELEASE expands to
     FreeBSD-11.0-CURRENT-powerpc-powerpc64.  Even with
     removing the prefixing 'FreeBSD-', the string is 30
     characters long, leaving zero room for suffixing the
     type of ISO media (BO for bootonly, CD for cdrom, and
     DVD for dvdrom).

  Resolve these by defining VOLUME_LABEL when defining
  OSRELEASE if unset.  If OSRELEASE is defined by the
  builder, use the OSRELEASE from that definition as the
  VOLUME_LABEL.

  In addition, for cases where both TARGET and TARGET_ARCH
  are used for the VOLUME_LABEL, use TARGET_ARCH if it
  differs from TARGET.

  There are probably a few sharp edges here yet, but these
  problems are going to affect the powerpc/powerpc64 builds
  for 10.1-RELEASE, so the immediate concern is fixing the
  underlying problem at hand quickly, and less so about the
  elegance of the fix.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation
MFS10 r273767 / MFC r273638:
Revert somewhat hackish geom_disk optimization, committed as part of r256880,
and the following r273143 commit, supposed to workaround introduced issue by
quite innocent-looking change.

While there is no clear understanding why, but r273143 is accused in data
corruption in some environments with high I/O load.  I personally don't see
any problem in that commit, and possibly it is just a trigger to some other
bug somewhere, but better safe then sorry for now.

Requested by:   scottl@
Approved by:	re (kib@)
MFS10 r273814
MFC r273704

Fix ATA CF ERASE breakage caused by 268205

PR:		194606
Approved by:	re (marius)
Sponsored by:	Multiplay
MFS10 r273573, MFC r273356:
Fix a race in pmap_emulate_accessed_dirty() that could trigger a EPT
misconfiguration VM-exit.

MFS10 r273807, MFC r273666:
Don't pass the 'error' return from an I/O port handler directly to vm_run().

Approved by:	re (kib)
Update releng/10.1 to -RC4 as part of the 10.1-RELEASE cycle.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation
Update the hardware page to reflect CPU updates/additions
added in head@r273941.

Since the original commit requires changes to the doc/
repository after the release tag had already happened,
(re)define entities in share/xml/release.ent that reflect
doc@r45900 to prevent build breakage.

Requested by:	gavin
Approved by:	re (implicit, relnotes)
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