MFC r257650:

Defer loading of kernel and modules if the beastie menu is enabled. Add a
kernel selection menu to the beastie menu. List of kernels is taken from
`kernels' in loader.conf(5) as a space (or comma) separated list of names
to display (up to 9). If not set, default value is "kernel kernel.old".
Does not validate that kernels exist because the next enhancement will be
to allow selection of the root device.

Discussed on:	-current
MFC r257821:

Extend loader_delay as-documented in beastie.4th(8) and delay.4th(8),
making it available to architectures that do not use or load the beastie
menu. This is reported to save headaches on some PPC systems where unload
followed by load does not produce the desired results wherein if-given
the opportunity to abort the initial loading sequence, you can customize
the first load.

Reviewed by:	nwhitehorn, kan
Discussed on:	-current
MFC r258269: Refactor draw-beastie function.

Discussed on:	-hackers
MFC r258270:

Add a try-include word (which acts the same as "include") and use it to
conditionally include (but ignore failures) /boot/loader.rc.local and
/boot/menu.rc.local -- to make customizing the menu easier.

Reviewed by:	alfred
Discussed on:	-hackers
MFR r261294:

Remove an unneeded space in the BERI merge.

Sponsored by:	DARPA, AFRL
MFC r261499 (pjd):

Fix installations that use kernels without CAPABILITIES support.
(not quite, due to date difference) MFC r262719:

Document the fact that OpenSSH default configuration requires Capsicum
capability mode support in kernel, which have been worked around later
but it's still recommended to have it enabled.

Reported by:	many
MFC	r262623, r262667:

ext2fs: use of tab vs spaces.

Consistently use a single tab after a #define as mentioned in style(9).
Use tabs instead of space for indenting.
Fix a typo: "hash_vesion".

No functional change.
MFC r262441-262442,262447,262461-262464,262655:

- Consistently pass around context information using a simple pointer.
  This fixes some dereferencing bugs in Chinese character set conversions.
- Fix Simplified Chinese character set conversions by switching around the
  fields of an internal struct so it corresponds with the way variables of
  this type are initialised.
- Fix an array index out of bounds bug in iconv VIQR (Vietnamese) module.
- Silence gcc warning about unsigned comparison with 0.

Also record r258316 and r258587 as merged so they no longer show up as
eligible.

PR:		185964
Submitted by:	Manuel Mausz <manuel-freebsd@mausz.at>
Merge r261590, r261592 from head:
  Remove identical vnet sysctl handlers, and handle CTLFLAG_VNET
  in the sysctl_root().

  Note: SYSCTL_VNET_* macros can be removed as well. All is
    needed to virtualize a sysctl oid is set CTLFLAG_VNET on it.
    But for now keep macros in place to avoid large code churn.
Merge r261590: Fixup for r261590 (vnet sysctl handlers cleanup)
Merge 261593 from head:
  Provide macros that allow easily export uma(9) zone limits and
  current usage via sysctl(9).
Merge 261595: simplify the SYSCTL_COUNTER_U64() macro.
Merge r261722, r261723, r261724, r261725 from head:
  several minor improvements for UMA_ZPCPU_ZONE zones.
Merge r261796 from head:
  While it isn't too late and kvm_read_zpcpu() function isn't yet used
  outside libkvm(3), change its order of arguments, so that it is the
  same as in kvm_read().
Merge r261805 from head:
  Add kvm_getncpus() to obtain mp_ncpus.
Merge r261582, r261601, r261610, r261613, r261627, r261640, r261641, r261823,
      r261825, r261859, r261875, r261883, r261911, r262027, r262028, r262029,
      r262030, r262162 from head.

  Large flowtable revamp. See commit messages for merged revisions for
  details.

Sponsored by:	Netflix
Disable amd64 TLB Context ID (pcid) by default for now

There are a number of reports of userspace application crashes that
are "solved" by setting vm.pmap.pcid_enabled=0, including Java and the
x11/mate-terminal port (PR ports/184362).

For now apply a band-aid of disabling pcid by default in stable/10.

Sponsored by:	The FreeBSD Foundation
MFC r262499, r262505, r262507, r262509:

r262499:
  release.sh:
  - Add a VCSCMD variable that defaults to 'svn checkout',
    and update places 'svn co' is used directly.
  - After sourcing a configuration file, prefix SRCBRANCH,
    PORTBRANCH, and DOCBRANCH with the SVNROOT.
  - Properly capitalize 'FreeBSD.org' in the default SVNROOT.
  - Update Copyright.

  release.conf.sample:
  - Add an example to use git instead of svn, by nullifying
    SVNROOT, and setting SRCBRANCH, DOCBRANCH, and PORTBRANCH
    to the URL fo a git repository.

  release.7:
  - Document VCSCMD.

r262505:
  In release/Makefile, remove exclusion of CVS directories in the
  src/ and ports/ distributions.

  While I am thinking about it, exclude .git directories for src/
  and ports/, as somewhat of a followup to r262499.

r262507:
  Chase r262505, and remove CVS exclusion from picobsd builds.

r262509:
  Rework how WORLD_FLAGS and KERNEL_FLAGS are set, to remove an
  unnecessary expr(1) call.

Sponsored by:	The FreeBSD Foundation
Merge r262770 from head: pacify gcc.
MFC	r262678;
ufs: small formatting fixes.

Cleanup some extra space.
Use of tabs vs. spaces.
No functional change.

Reviewed by:	mckusick