MFC r254120, r257862 and r267395:
- Fix out of range shifting bug in bitops.h.
- Make code a bit easier to read by adding parenthesis.

Approved by:	re, gjb @


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267555 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC: r267478

MFp4: change 1191346

In print_header32_tok(), correct printing in the XML case.  This lead to
invalid XML files before.

PR:		176259
Submitted by:	zi
Approved by:	re (marius)


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267576 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Fix the svn revision number for uhso(4) note.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267584 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Document r263662, 800.loginfail refinement.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267585 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Remove content-less sections.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267586 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Whitespace cleanup.  No content changes.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267587 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
In installation/article.xml:

 - Update references from 9.1R to 9.3R.
 - Remove CVS reference.
 - Update list of earlier FreeBSD versions to remove
   unsupported versions.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267588 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Trim errata/article.xml of old entries.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267590 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r267342:

  Use bitwise OR instead of logical OR when constructing value for
  SET_FEATURES/NUMBER_OF_QUEUES command.

Sponsored by:	Intel
Approved by:	re (gjb)


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267619 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r265590, r265594, r265595, r265599 [1], r265601 [1],
r265602 [1], r265603 [1], r265605 [1], r265607 [1],
r267554 [1], r267595:

r265590:
  Modify release.xsl to allow proper attribution for
  sponsored and/or contributed works.

r265594:
  Add two new entity files in followup to r265590,
  sponsor.ent and vendor.ent, which will be used for
  sponsor/vendor names and URLs.

r265595:
  Add references to sponsor.ent and vendor.ent in
  relnotes/article.xml and share/xml/catalog.xml.

r265599:
  Add DARPA, AFRL to sponsor.ent.

r265601:
  Add LSI and Spectra Logic to sponsor.ent.

r265602:
  Add Netgate to sponsor.ent.

r265603:
  Add a note to keep the entity lists sorted alphabetically.

r265605:
  Add Google to the sponsor.ent file.

r265607:
  Separate &darpa; entity and create &darpa_afrl to
  avoid confusion.

r267554:
  Add &citrix; and &citrix.rd; macros.

r267595:
  Remove 'Inc.' for consistency.

[1] - Partial, entity addition only.

Approved by:	re (hrs)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267628 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Add sponsorship attribution for the following revisions:
 256437, 257125, 257126, 259519, 260082, 262988, 263817, 265729,
 259269, 259406, 262706, 262879

Add DK Hostmaster A/S to the sponsors.ent file.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267644 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Update stable/9 to -RC1 in preparation of branching releng/9.3

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267653 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Update __FreeBSD_version now that releng/9.3 is branched.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267657 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Switch stable/9 back to -PRERELEASE now that releng/9.3 is branched.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267658 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC revisions 257795,257817,257819,257937-257938,258264-258265,258267,
258854,259113,259427 (11 revisions; summarized below).
r257795: Replace pkg-tools with pkgng
r257817: Fix cosmetic typos
r257819: Use `pkg -vv' to obtain ABI
r257937: Unbreak the installer
r257938: Remove the env(1) but keep the var
r258264: Kick an unused orphan to the curb ;)
r258265: Improve debugging with f_eval_catch()
r258267: Fix package installation from physical media such as DVD
r258854: Fix PKG_ABI detection after pkg-1.2
r259113: Fix failed attempt to send pkg(8) stderr to /dev/null
r259427: Export 'REPOS_DIR' when selected source medium is cdrom

MFC after:	3 days


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267683 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Add missing mergeinfo for 267683.


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267684 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Document missing SAs on the 9.2R errata page.

Submitted by:	pi
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267686 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r267600:

cxgbe(4):  Fix bug in the fast rx buffer recycle path.  In some cases rx
buffers were getting recycled when they should have been left alone.


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267695 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Purge information from the stable/9 relnotes that applied to
9.3-RELEASE, after releng/9.3 is branched.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267696 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Remove bogus mergeinfo introduced in r267684.

Approved by:	re (implicit)
Sponsored by:	The FreeBSD Foundation


git-svn-id: svn+ssh://svn.freebsd.org/base/stable/9@267702 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f