Merge branch 'mas1' into gsocdrm_github
Merge branch 'mas1' into gsocdrm_jfree
offset >> PAGE_SHIFT in sys/vm/device_pager.c
offset << PAGE_SHIFT for dev_dmmap call in sys/vm/device_pager.c
Merge branch 'gsocdrm_alter' into gsocdrm_github
Merge branch 'gsocdrm_github' into gsocdrm_jfree
em/emx.4: Mention the tranmission queue arbitration
bnx.4: Mention the tranmission queue arbitration
igb.4: Mention the tranmission queue arbitration
kernel: Fix bus_dmamem_alloc()

Its call to pmap_change_attr() contained a typo which caused kernel
panics on some machines.

Reported-by: Markus Pfeiffer
With-advice-from: Venkatesh Srinivas
kernel - Fix /dev/mem

* Fix offset vs page-index mistake for old-style device mmap.  This
  fixes /dev/mem and programs that use it like acpidump.

* There may be other issues.

Reported-by: David Shao bug #2576
kernel - Fix panic when usched is used to force a cpu w/the dfly scheduler

* Fix a panic for 'usched dfly:0x1 sh', or other similar cpu forcing
  mechanic.

* The scheduler was not being notified of the forced migration which
  caused it to assert on a sanity check later on.  Add the needed
  infrastructure.

Reported-by: vsrinivas
kernel/amr: Move amrd (disk) adding before amrp (cam passthrough).

This fixes a panic seen when amr/amrp were compiled into the kernel.

Dragonfly-bug: <http://bugs.dragonflybsd.org/issues/2575>
Reported-by:   justin
Actual-fix-by: sephe
kernel - Fix sendfile() based deadlock

* Fix a sendfile() based deadlock.  It turns out that after all of
  that work we can't soft-busy the page anyway because it can deadlock
  against a vfs_msync() -> ... -> vm_object_page_clean() sequence.

Reported-by: pavalos
kernel - Fix panic when usched is used to force a cpu w/the dfly scheduler (2)

* Missing file in last commit.
kernel: Use TABs to indent in 'files'.
Fix typo in some manpages: specifed -> specified
loader.conf - Clarify kernel early boot comport operation

* Add clarification.  sioX.port must also be specified for early kernel
  boot messages, otherwise the serial console doesn't activate until
  init is executed.

  Defaulting this value is difficult because missing serial ports can
  cause different units to probe to different ports.  Thus this is a
  required field if a serial console is desired.
Merge branch 'master' into gsocdrm_alter
master sys/vm/device_pager.c