MFC r261577:
  Revert r234666.  Clearing TWSI IRQ seems to cause watchdog timeout
  on old Yukon II controllers.
MFC r262451:

hier(7): Add /usr/lib/private
MFC r262277:

malloc_aligned() may not leave enough space for pointer to allocated memory,
saving the pointer will overwrite bytes belongs to another memory block
unexpectly, to fix the problem, use (allocated address + sizeof(void *)) as
initial value, and slip to next aligned address, so maximum extra bytes is
sizeof(void *) + align - 1.

Tested by: Andre Albsmeier < mail at ma17 dot ata dot myota dot orgndre >

MFC r262334:

Increase alignment to size of pointer if the alignment is too small.
Some modules do not align data at least to size of pointer, they uses a
smaller alignment, but our pointer should be aligned to its native
boundary, otherwise on some platforms, hardware alignment checking
will cause bus error.
MFH (r256768): don't report an error for no-op add / remove
MFH (r256875): start rtsold if necessary
MFH (r256878): add a reload command
MFH (r261233): fix whitespace and bump copyright
MFH (r261234): increase buffer size
MFH (r260904): fix format string
MFH (r261230, r261263): fix buffering issues
MFH (r261284): bump copyright
MFC	r262346:
ext2fs: fully enable ext4 read-only support.

The ext4 developers tend to tag Ext4-specific flags as
"incompatible" even when such features are not relevant for
read-only support.  This is a consequence of the process
though which this filesystem is implemented without design
and the fact that some new features are not extensible to
ext2/3.

Organize the features according to what we support and sort
them so that we can now read-only mount filesystems with
some features that may be found in newly formatted ext4 fs.

Submitted by:	Zheng Liu
MFH (r261320): upgrade openssh to 6.5p1
MFH (r261340): enable sandboxing by default
MFH (r261511, r261542): add an example to the man page
MFC r257472

Rate limit (to once per minute) "Listen queue overflow" message in
sonewconn().
MFC: r261884

Correct the order of arguments to mtx_init().

PR:		186701
Submitted by:	Takanori Sawada <tak.swd at gmail.com>
MFC: r262296

Match the correct variable to the variable description.

PR:		121173
Submitted by:	Thomas Mueller <tmueller at sysgo.com>
MFC r262465:

Add a flag to run's device list which uses a standard scsi eject.
The flag indicates that the mcu doesn't need to load firmware.

Tested by:	Alex Deiter <alex dot deiter at gmail.com>, myself
Tested on:	ASUS USB-N66
MFC r262471:

In sys/sparc64/sparc64/spitfire.c, prevent signed shift overflow by
casting to the appropriate type.  (Note this fix cannot be done in
sys/sparc64/sparc64/spitfire.c, since that file is also included by
assembly source files.)

Reviewed by:	marius
MFC r262472:

Make sure a for loop in fire_alloc_msix() terminates, by making the loop
counter signed.

Reviewed by:	marius
MFC r261296:

Merge from CheriBSD:
commit c1acf022c533c5ae27e0cd556977eafe3f5959eb
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Fri Jan 17 21:46:44 2014 +0000

	Add an option WITHOUT_NCURSESW to suppress building and linking to
	libncursesw.  While wide character support it useful we'd like to
	only need one ncurses library on embedded systems.

Sponsored by:	DARPA, AFRL
MFC r261300:

Add a missing options file.

Sponsored by:	DARPA, AFRL
MFC: 261298
Merge from CheriBSD:
commit 70b8f0c127db6b80411789d237b403cc64a93573
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Mon Jan 27 22:53:57 2014 +0000

	Move mtree.5 to usr.sbin/nmtree.
	Remove note that mtree 2.0 format files aren't supported.

Sponsored by:	DARPA, AFRL
MFC: r260889, r260890, r260911:

	r260911 | imp | 2014-01-20 10:45:36 -0700 (Mon, 20 Jan 2014) | 5 lines

	Don't lock in the generic grab just to lock again in the specific grabs.

	r260890 | imp | 2014-01-19 12:39:13 -0700 (Sun, 19 Jan 2014) | 11 lines

	Introduce grab and ungrab upcalls. When the kernel desires to grab the
	console, it calls the grab functions. These functions should turn off
	the RX interrupts, and any others that interfere. This makes mountroot
	prompt work again. If there's more generalized need other than
	prompting, many of these routines should be expanded to do those new
	things.

	Reviewed by:    bde (with reservations)