MFC r262513:
 Update release/release.conf.sample to reflect changes in r262509.

Sponsored by:	The FreeBSD Foundation
MFC r261283:

Import libc++ 3.4 release.  This contains a lot of bugfixes, and some
preliminary support for C++1y.

MFC r261604:

HEAD is not buildable for the past day.  Commit a 'quick fix' in order to permit
buildworld to complete.

Reviewed by:	theraven

MFC r261608:

Apply a cleaner solution for the sign warnings that can occur when
compiling libc++'s <locale> header with -Wsystem-headers on.

This has also been submitted upstream.

Reported by:	asomers

MFC r261801:

An ABI incompatibility crept into the libc++ 3.4 import in r261283.  It
was caused by upstream libc++ commit r194536, which aimed to make the
headers more standards-compliant, by making std::pair's copy constructor
trivial.  Unfortunately, this could cause certain C++ applications using
shared libraries built against the previous version of libc++ to crash.

Fix the ABI incompatibility by making std::pair's copy constructor
non-trivial again.

Please note: Any C++ applications or shared libraries built with libc++
between r261283 and this revision should be recompiled.

Reported by:	stefanf
MFC r253102:

Remove redundant definitions to appease tinderbox.

Note: This MFC is required by a future merge of changes to amd64's and
i386's atomic.h.
MFC r254610, r254611, r254617, r254620:

Implement atomic_swap() and atomic_testandset().
Implement atomic_cmpset_64() and atomic_swap_64() for i386.

The following revisions were merged at the same time, to avoid build
breakage:
    o  r256118
    o  r256119
    o  r256131
MFC r254623:

Reimplement atomic operations on PDEs and PTEs in pmap.h.  This change
significantly reduces duplicate code and make it easier to read.

Note: This merge fixes the build of i386's PAE kernel, broken in r262807.
MFC r261832-261834:

r261832:
    Add cross references between rc.conf(5) and jail.conf(5).

r261833:
    Add commas (,) to the list in the SEE ALSO section, to match most
    other manuals.

r261834:
    Bump .Dd forgotten in r261832.
MFC r262553:
Pass proper pointer to bus_dmamem_free() in mps_iocfacts_free().

Passing there pointer into the middle of allocated area caused kernel
panic during reinit, for example, after firmware upgrade.
MFC r262575:
Restore SIM freeze/release match, broken at r253549.

This fixes problem with SIM left in frozen state after reinit, for example,
after firmware update.
MFC r226824:

contigmalloc(9) and contigfree(9) are now implemented in terms of other
more general VM system interfaces.  So, their implementation can now
reside in kern_malloc.c alongside the other functions that are declared
in malloc.h.
MFC r226848:

Tidy up the comment at the head of vm_page_alloc, and mention that the
returned page has the flag VPO_BUSY set.
MFC r226891:

Use "u_long" instead of "unsigned long".
MFC r225817 (des):
  Don't force active mode FTP.

Sponsored by:	The FreeBSD Foundation
MFC r258305, r258770, r259400, r259426:

r258305:
  Use the IMAGES variable to determine which image files to
  remove as part of 'make -C /usr/src/release clean'.

r258770 (hrs):
  Add NOPKG to disable pkg-stage.

r259400:
  Reduce disc1.iso size by 74MB by removing lib32 libraries,
  sendmail, and atf.

r259426:
  Add a pkg(8) repository configuration file for cdrom-based
  package installation.

  As part of the 'pkg-stage' target, copy the configuration
  file to the 'packages/repos/' directory on the DVD filesystem.

Sponsored by:	The FreeBSD Foundation
MFC r260772:
  Update the pkg-stage target to be more compatible with
  pkg-1.2:

  - Add a release-dvd.conf pkg(8) configuration file to override
    the default FreeBSD.conf configuration.
  - Remove architecture-specific pkg-stage.conf files, consolidate,
    and move their contents to scripts/pkg-stage.sh.
  - Use 'pkg -vv' to determine the ABI, which is used as the
    cache directory.

  Prior to these changes, it would be possible for pkg-stage to
  fetch conflicting binary packages from multiple repositories.

NOTE:  WITH_DVD=1 is broken on stable/9, pending updates to the
pkg(7) code.  The 'dvdrom' target on stable/9 is broken as-is,
so there is no harm merging this change now.  I think.

Sponsored by:	The FreeBSD Foundation
MFC: r262603

mdoc cleanup.
[automated] Merge in upstream-github/stable/9

Conflicts:
	release/Makefile