MFC r269091:

Fix spelling of Camellia algorithm.  While here, replace blank lines
between examples with actual .Pp breaks.
MFC of r269303:

When restoring a UFS dump onto a ZFS filesystem, an assertion in
restore was failing because ZFS was reporting a blocksize that was
not a multiple of 1024.  Replace restore's failed assertion with
code that writes restored files in a blocksize that works for
restore (a multiple of 1024) despite being non-optimal for ZFS.

Submitted by: Dmitry Morozovsky
Tested by:    Dmitry Morozovsky
MFC r269318:
  Replace 'GNATS' with 'Bugzilla' in the base subversion commit
  template.

Approved by:	peter (implicit, original approver)
Sponsored by:	The FreeBSD Foundation
MFC r269347:
Do not generate 1000 unique lock names for nfsrc hash chain locks.
Shorten the names of some nfs mutexes.
MFC r256691, r256748: casuword fixes

  Use unsigned compare against KERNBASE addr.
  Use atomic ops on armv6.
MFC r265456, r265578:
Add a postinit debugger hook to rtld. This will be used by dtrace(1) to halt
the victim process before its entry point is called, at which point probes
and DOF data are registered with the kernel. The r_debug_state hook cannot
be used for this purpose, as it is called before the program's init routines
are invoked and in particular before DOF data is registered (via drti.o).
MFC:		r269682

Merge OpenSSL 1.0.1i.
MFC r269585 - Honour WITH and WITHOUT_INET6_SUPPORT.

Approved by:	glebius (mentor - implicit)
Merge r269353:

Fix breakage introduced by r256843: removing the SA_CCB_WAITING bit
left some of the decisions based on its counterpart, SA_CCB_BUFFER_IO
being random.  As a result, propagation of the residual information
for the SPACE command was broken, so the number of filemarks
encountered during a SPACE operation was miscalculated.  Consequently,
systems relying on properly tracked filemark counters (like Bacula)
fell apart.

The change also removes a switch/case in sadone() which r256843
degraded to a single remaining case label.

PR:		192285
Merge r269470:

Avoid a divide-by-zero panic when setting the baudrate to 0.
MFC r265629, r265630

MFC r265629:
Handle the different event types properly in rd_event_addr(). In particular,
with r265456 _r_debug_postinit can be used for RD_POSTINIT events. rtld(1)
uses r_debug_state for dl state transitions, so we use its address for
RD_DLACTIVITY events.

MFC r265630:
Fix the rd_event_addr prototype and slightly clarify the use of the "event"
parameter.
MFC r265631:
Re-apply r248644. This fixes an annoying problem which caused dtrace -c to
fail to attach to stripped binaries. With the _r_debug_postinit symbol,
dtrace(1) can now set a breakpoint in the victim process after it has
registered its DOF table(s) with the kernel. r_debug_state cannot be used
for this purpose since it is called before DOF is made available, in which
case dtrace(1) cannot create USDT probes before the program begins
execution.
MFC r269086:

As of r268075, the responsibility of rounding up buffer to optimal size have
been transferred from zio_compress_data to its caller.  Therefore, passing
the 'minblocksize' down will be a no-op.

Eliminate the parameter to reduce diff against upstream.
MFC r269093:

Transform the I/O when vdev_physical_ashift is greater than
SPA_MINBLOCKSHIFT.
MFC the cddl/contrib/opensolaris/cmd/zpool portion of r267803 (joel):

mdoc: remove superfluous paragraph macros.
MFC r268621 (smh) + r268625:

Don't report non-native block-size pools under zpool status -x

zpool status -x is used to identify pools that are exhibiting
errors or are otherwise unavailable, therefore non-native
block-size pools shouldn't be reported.

Also update man page to clarify other additional conditions
which won't cause a pool to be displayed under zpool status -x.

Sponsored by:   Multiplay
MFC r269100:

Diff reduction against Illumos.
MFC r269097:

Use the right length.
MFC r269098:

Use the right lengths.

Submitted by:	Sascha Wildner
MFC r269408, r269409:

shm_open()/shm_unlink() ktrace support.