[PC-BSD Commits] [pcbsd/freebsd] e8958f: MFC: Add extra files to the KLD random.ko module t...

GitHub noreply at github.com
Fri Oct 25 13:56:50 PDT 2013


  Branch: refs/heads/stable/10
  Home:   https://github.com/pcbsd/freebsd
  Commit: e8958f2a0be4044af0aee3bb93c99a2d92d32d22
      https://github.com/pcbsd/freebsd/commit/e8958f2a0be4044af0aee3bb93c99a2d92d32d22
  Author: markm <markm at FreeBSD.org>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M sys/modules/random/Makefile

  Log Message:
  -----------
  MFC: Add extra files to the KLD random.ko module to allow it to load.

Approved by:	re (kib)


  Commit: 9f3020013a19321c4f393376c9191ac458efee60
      https://github.com/pcbsd/freebsd/commit/9f3020013a19321c4f393376c9191ac458efee60
  Author: jhb <jhb at FreeBSD.org>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M sys/boot/i386/btx/btx/btx.S

  Log Message:
  -----------
  MFC 256293:
Sanitize the %eflags returned by BIOS routines.  Some BIOS routines enter
protected mode and may leave protected-mode-specific flags like PSL_NT set
when they return to real mode.  This can cause a fault when BTX re-enters
protected mode after the BIOS mode returns.

Approved by:	re (gjb)


  Commit: 3e1e4bc86daab567ca2a356b36e695c00e270dfe
      https://github.com/pcbsd/freebsd/commit/3e1e4bc86daab567ca2a356b36e695c00e270dfe
  Author: neel <neel at FreeBSD.org>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M sys/amd64/vmm/vmm_dev.c

  Log Message:
  -----------
  MFC r256570:

Fix the witness warning that warned against calling uiomove() while holding
the 'vmmdev_mtx' in vmmdev_rw().

Rely on the 'si_threadcount' accounting to ensure that we never destroy the
VM device node while it has operations in progress (e.g. ioctl, mmap etc).

Approved by:	re (rodrigc)


  Commit: c5f96af1659ab5e188903820054be4d59e45fae4
      https://github.com/pcbsd/freebsd/commit/c5f96af1659ab5e188903820054be4d59e45fae4
  Author: hrs <hrs at FreeBSD.org>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M etc/rc.d/jail

  Log Message:
  -----------
  MFC 256440, 256498:

 - Normalize jailname.  "example.com" is converted to "example_com".
 - Fix a bug that some $jail_{jname}_foo variables did not work.
 - Fix a bug which prevented $jail_devfs_ruleset from working[1].
 - Move $jail_parameters to the last of the configuraiton lines[1].
 - Fix "ifname|addr" syntax support in jail_{jname}_ip.
 - Create /var/run/jail_{jname}.id because ezjail-admin depends on it.

Reported by:	jase [1]
Approved by:	re (gjb)


  Commit: 185f4102b2851a4b384f6c08679e118ef1962d58
      https://github.com/pcbsd/freebsd/commit/185f4102b2851a4b384f6c08679e118ef1962d58
  Author: alfred <alfred at FreeBSD.org>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M sys/ofed/include/linux/gfp.h

  Log Message:
  -----------
  Fix __free_pages() in the linux shim.

__free_pages() is actaully supposed to take a "struct page *" not
an address.

MFC: 256546

Approved by:	re


  Commit: 9a4ff0a6cf4f41e2680614731c44b7b980cf60d2
      https://github.com/pcbsd/freebsd/commit/9a4ff0a6cf4f41e2680614731c44b7b980cf60d2
  Author: dteske <dteske at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M usr.sbin/bsdinstall/bsdinstall.8
    R usr.sbin/bsdinstall/scripts/docsinstall
    A usr.sbin/bsdinstall/scripts/docsinstall
    R usr.sbin/bsdinstall/scripts/entropy
    A usr.sbin/bsdinstall/scripts/entropy

  Log Message:
  -----------
  MFC r256489:
Add executable bit to docsinstall [old] and entropy [new] scripts.

MFC r256541:
Document BSDINSTALL_TMPBOOT environment variable introduced by SVN r256343.

Approved by:	re (gjb)


  Commit: d13262ef1743bf6650cc090b40cd08034b0442e4
      https://github.com/pcbsd/freebsd/commit/d13262ef1743bf6650cc090b40cd08034b0442e4
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M lib/libpam/modules/pam_pefs/Makefile
    M lib/libpam/modules/pam_pefs/pam_pefs.8
    M sbin/pefs/Makefile
    M sbin/pefs/pefs.8
    M sbin/pefs/pefs_key.c
    R sys/crypto/hmac/hmac.c
    R sys/crypto/hmac/hmac.h
    R sys/crypto/pkcs5v2/pkcs5v2.c
    R sys/crypto/pkcs5v2/pkcs5v2.h
    M sys/fs/pefs/pefs_crypto.c
    M sys/fs/pefs/pefs_crypto.h
    M sys/fs/pefs/pefs_dircache.c
    M sys/fs/pefs/pefs_dircache.h
    A sys/fs/pefs/pefs_hmac.c
    A sys/fs/pefs/pefs_hmac.h
    A sys/fs/pefs/pefs_pkcs5v2.c
    A sys/fs/pefs/pefs_pkcs5v2.h
    M sys/fs/pefs/pefs_vnops.c
    M sys/modules/pefs/Makefile

  Log Message:
  -----------
  Update PEFS in head with latest from GLEB


  Commit: 7cc377054855b77d914cd5662b99426e2ad7c8fe
      https://github.com/pcbsd/freebsd/commit/7cc377054855b77d914cd5662b99426e2ad7c8fe
  Author: dim <dim at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M sys/xen/xen-os.h

  Log Message:
  -----------
  MFC r256746:

Remove redundant redeclaration of gdtset in sys/xen/xen-os.h, to silence
a gcc warning.

Approved by:	re (glebius)


  Commit: 4bbe413766853fb56498b922eeb0146111eb7ca3
      https://github.com/pcbsd/freebsd/commit/4bbe413766853fb56498b922eeb0146111eb7ca3
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M usr.sbin/bhyve/pci_ahci.c

  Log Message:
  -----------
  MFC r256709:

  Eliminate unconditional debug printfs.

  Linux writes to these nominally read-only registers,
  so avoid having bhyve write warning messages to stdout
  when the reg writes can be safely ignored. Change the
  WPRINTF to DPRINTF which is conditional.

Approved by:	re (gjb)


  Commit: 9ad9e387e9806be0093be97b2e0952a7fab968e9
      https://github.com/pcbsd/freebsd/commit/9ad9e387e9806be0093be97b2e0952a7fab968e9
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/bhyverun.h
    M usr.sbin/bhyve/mptbl.c
    M usr.sbin/bhyve/pci_hostbridge.c
    M usr.sbin/bhyve/pci_virtio_block.c
    M usr.sbin/bhyve/pci_virtio_net.c
    M usr.sbin/bhyve/rtc.c

  Log Message:
  -----------
  MFC r256709:

  Eliminate unconditional debug printfs.

  Linux writes to these nominally read-only registers,
  so avoid having bhyve write warning messages to stdout
  when the reg writes can be safely ignored. Change the
  WPRINTF to DPRINTF which is conditional.

Approved by:	re (delphij)


  Commit: 084ebbef83ad0a31d7aa6099c1eedad33eba707d
      https://github.com/pcbsd/freebsd/commit/084ebbef83ad0a31d7aa6099c1eedad33eba707d
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M sys/dev/xen/blkfront/blkfront.c

  Log Message:
  -----------
  MFC: r256425

Centralize the detection logic for the Hyper-V hypervisor.

Submitted by:	Roger Pau Monné
Sponsored by:	Citrix Systems R&D
Reviewed by:	gibbs, grehan
Approved by:	re (gjb)

sys/sys/systm.h:
 * Add a new VM_GUEST type, VM_GUEST_HV (HyperV guest).

sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c:
sys/dev/hyperv/vmbus/hv_hv.c:
sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c:
 * Set vm_guest to VM_GUEST_HV and use that on other HyperV related
   devices instead of cloning the cpuid hypervisor check.
 * Cleanup the vmbus_identify function.


  Commit: ecdcee0674e19d97166a740fe724d6b340d47e28
      https://github.com/pcbsd/freebsd/commit/ecdcee0674e19d97166a740fe724d6b340d47e28
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
    M sys/dev/hyperv/vmbus/hv_hv.c
    M sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
    M sys/sys/systm.h

  Log Message:
  -----------
  MFC r256425:

Centralize the detection logic for the Hyper-V hypervisor.

Submitted by:	Roger Pau Monné
Sponsored by:	Citrix Systems R&D
Reviewed by:	gibbs, grehan
Approved by:	re (gjb)

sys/sys/systm.h:
 * Add a new VM_GUEST type, VM_GUEST_HV (HyperV guest).

sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c:
sys/dev/hyperv/vmbus/hv_hv.c:
sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c:
 * Set vm_guest to VM_GUEST_HV and use that on other HyperV related
   devices instead of cloning the cpuid hypervisor check.
 * Cleanup the vmbus_identify function.
------------------------------------------------------------------------


  Commit: 6de0bdec97a101f87cbb605001de11d9d4c5c9d7
      https://github.com/pcbsd/freebsd/commit/6de0bdec97a101f87cbb605001de11d9d4c5c9d7
  Author: np <np at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M sys/conf/files
    M sys/dev/cxgbe/common/common.h
    R sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu
    A sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
    M sys/dev/cxgbe/firmware/t4fw_cfg.txt
    M sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
    M sys/dev/cxgbe/firmware/t4fw_interface.h
    R sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu
    A sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
    M sys/dev/cxgbe/firmware/t5fw_cfg.txt
    M sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
    M sys/dev/cxgbe/t4_main.c
    M sys/dev/cxgbe/tom/t4_cpl_io.c
    M sys/modules/cxgbe/t4_firmware/Makefile
    M sys/modules/cxgbe/t5_firmware/Makefile

  Log Message:
  -----------
  MFC r256459.

cxgbe(4): Update T4 and T5 firmwares to 1.9.12.0

Approved by:	re (glebius)


  Commit: b36ea7524500e7b946ee61a3d580644d0e9320cd
      https://github.com/pcbsd/freebsd/commit/b36ea7524500e7b946ee61a3d580644d0e9320cd
  Author: np <np at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M sys/dev/cxgbe/adapter.h
    M sys/dev/cxgbe/t4_sge.c

  Log Message:
  -----------
  MFC r256477:

cxgbe(4): Store the log2 of the # of doorbells per BAR2 page for both
ingress and egress queues, and for both T4 and T5.  These values are
used by the T4/T5 iWARP driver.

Approved by:	re (glebius)


  Commit: 514a2c2eaae634f1b2dfb3644838d92fa2916acb
      https://github.com/pcbsd/freebsd/commit/514a2c2eaae634f1b2dfb3644838d92fa2916acb
  Author: alfred <alfred at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M sys/ofed/drivers/net/mlx4/en_netdev.c

  Log Message:
  -----------
  Fix resource free.

The order of releasing resources in mlxen was wrong, which caused
panic on reload of the module.

MFC: 256682

Submitted by:	Shahar Klein (shahark at mellanox.com)
Approved by:	 re


  Commit: 01cd6364a8ed9e44d43face023115015f242e98b
      https://github.com/pcbsd/freebsd/commit/01cd6364a8ed9e44d43face023115015f242e98b
  Author: np <np at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    A sys/dev/cxgbe/iw_cxgbe/cm.c
    A sys/dev/cxgbe/iw_cxgbe/cq.c
    A sys/dev/cxgbe/iw_cxgbe/device.c
    A sys/dev/cxgbe/iw_cxgbe/ev.c
    A sys/dev/cxgbe/iw_cxgbe/id_table.c
    A sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
    A sys/dev/cxgbe/iw_cxgbe/mem.c
    A sys/dev/cxgbe/iw_cxgbe/provider.c
    A sys/dev/cxgbe/iw_cxgbe/qp.c
    A sys/dev/cxgbe/iw_cxgbe/resource.c
    A sys/dev/cxgbe/iw_cxgbe/t4.h
    A sys/dev/cxgbe/iw_cxgbe/user.h
    M sys/modules/cxgbe/Makefile
    A sys/modules/cxgbe/iw_cxgbe/Makefile

  Log Message:
  -----------
  MFC r256694, r256713, r256714.

r256694:
iw_cxgbe: iWARP driver for Chelsio T4/T5 chips.  This is a straight port
of the iw_cxgb4 found in OFED distributions.

r256713:
iw_cxgbe should have a dependency on t4nex.

r256714:
Fix typo in previous commit.

Approved by:	re (hrs)


  Commit: 8ac41f6ae646ed8aa679d47e2986684788211a2f
      https://github.com/pcbsd/freebsd/commit/8ac41f6ae646ed8aa679d47e2986684788211a2f
  Author: np <np at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    R sys/contrib/rdma/core_priv.h
    R sys/contrib/rdma/ib_addr.h
    R sys/contrib/rdma/ib_cache.h
    R sys/contrib/rdma/ib_cm.h
    R sys/contrib/rdma/ib_fmr_pool.h
    R sys/contrib/rdma/ib_mad.h
    R sys/contrib/rdma/ib_marshall.h
    R sys/contrib/rdma/ib_pack.h
    R sys/contrib/rdma/ib_sa.h
    R sys/contrib/rdma/ib_smi.h
    R sys/contrib/rdma/ib_umem.h
    R sys/contrib/rdma/ib_user_cm.h
    R sys/contrib/rdma/ib_user_mad.h
    R sys/contrib/rdma/ib_user_sa.h
    R sys/contrib/rdma/ib_user_verbs.h
    R sys/contrib/rdma/ib_verbs.h
    R sys/contrib/rdma/iw_cm.h
    R sys/contrib/rdma/rdma_addr.c
    R sys/contrib/rdma/rdma_cache.c
    R sys/contrib/rdma/rdma_cm.h
    R sys/contrib/rdma/rdma_cm_ib.h
    R sys/contrib/rdma/rdma_cma.c
    R sys/contrib/rdma/rdma_device.c
    R sys/contrib/rdma/rdma_iwcm.c
    R sys/contrib/rdma/rdma_user_cm.h
    R sys/contrib/rdma/rdma_verbs.c
    R sys/contrib/rdma/types.h
    M sys/modules/rdma/Makefile
    R sys/modules/rdma/addr/Makefile
    R sys/modules/rdma/cma/Makefile
    R sys/modules/rdma/core/Makefile
    R sys/modules/rdma/iwcm/Makefile

  Log Message:
  -----------
  MFC r256467:

Delete all of the old RDMA code (except krping, which was switched to
use sys/ofed some time back).  This has been sitting around as dead code
in the tree for a very long time.

Approved by:	re (hrs)


  Commit: 82b4688a6700a96d56f6a5c69264de9ce70dc6bb
      https://github.com/pcbsd/freebsd/commit/82b4688a6700a96d56f6a5c69264de9ce70dc6bb
  Author: gibbs <gibbs at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M sys/conf/files

  Log Message:
  -----------
  MFC 256813:

The Xen userland event channel driver isn't complete.  Disabled it
from the kernel build until it is ready.

sys/conf/files:
	Remove the entry for xen/evtchn/evtchn_dev.c so it is not included
	in any kernel builds.

Noticed by:	smh
Approved by:	re (hrs)
------------------------------------------------------------------------


  Commit: 71c5e06cccd7a1b993d32b76a3f872129a5c7c8f
      https://github.com/pcbsd/freebsd/commit/71c5e06cccd7a1b993d32b76a3f872129a5c7c8f
  Author: np <np at FreeBSD.org>
  Date:   2013-10-20 (Sun, 20 Oct 2013)

  Changed paths:
    M sys/contrib/rdma/krping/getopt.c
    M sys/contrib/rdma/krping/krping.c
    M sys/contrib/rdma/krping/krping.h
    M sys/contrib/rdma/krping/krping_dev.c

  Log Message:
  -----------
  MFC r256470:

Update krping to the latest upstream code.  Move all the FreeBSD
specific parts to krping_dev.c, which leaves the other files as
close to their upstream versions as possible.

Approved by:	re (glebius)


  Commit: 44f5357aec14c32040c49f1703b1d4c2cac5d080
      https://github.com/pcbsd/freebsd/commit/44f5357aec14c32040c49f1703b1d4c2cac5d080
  Author: andreast <andreast at FreeBSD.org>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M sys/powerpc/powermac/ata_kauai.c
    M sys/powerpc/powermac/ata_macio.c

  Log Message:
  -----------
  MFC: 256555

Move the resource allocation from the ata_*_probe section to the ata_*_attach
section. This prevents a boot crash on nearly all iMacs and PowerMacs/Books.

The allocation in the probe section was working before because ata_probe was
returning 0 which did not invoke a second DEVICE_PROBE. Now it returns
a BUS_PROBE_DEFAULT which can invoke a second DEVICE_PROBE which results in
a "failed to reserve resource" exit.

PR:	powerpc/182978
Approved by:	re(gjb)


  Commit: b31f0060b59a4d7ad2b7ddb3261a49fbdce0dad1
      https://github.com/pcbsd/freebsd/commit/b31f0060b59a4d7ad2b7ddb3261a49fbdce0dad1
  Author: neel <neel at FreeBSD.org>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M lib/libvmmapi/vmmapi.c
    M sys/amd64/amd64/pmap.c
    M sys/amd64/include/vmm.h
    M sys/amd64/vmm/intel/vmx.c
    M sys/amd64/vmm/intel/vmx.h
    M sys/amd64/vmm/intel/vmx_controls.h
    M sys/amd64/vmm/x86.c
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/bhyverun.h
    M usr.sbin/bhyve/spinup_ap.c
    M usr.sbin/bhyvectl/bhyvectl.c

  Log Message:
  -----------
  MFC r256645.

Add a new capability, VM_CAP_ENABLE_INVPCID, that can be enabled to expose
'invpcid' instruction to the guest. Currently bhyve will try to enable this
capability unconditionally if it is available.

Consolidate code in bhyve to set the capabilities so it is no longer
duplicated in BSP and AP bringup.

Add a sysctl 'vm.pmap.invpcid_works' to display whether the 'invpcid'
instruction is available.

Approved by:	re (hrs)


  Commit: bb4ca793bf3f1958efd8b4cf91d06caf0ff9feab
      https://github.com/pcbsd/freebsd/commit/bb4ca793bf3f1958efd8b4cf91d06caf0ff9feab
  Author: hrs <hrs at FreeBSD.org>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M etc/rc.d/jail

  Log Message:
  -----------
  MFC 256716,256835:

- Fix jail_parallel_start="YES".
- Fix ip[46].addr when interface parameter is not defined.
- Fix a bug which prevented jails from starting when $jail_conf was used and
  no jail name was specified.
- Display error messages when start/stop fails.

Approved by:	re (glebius)


  Commit: 287864b1a7317cf7568bd46c04a058a453c45509
      https://github.com/pcbsd/freebsd/commit/287864b1a7317cf7568bd46c04a058a453c45509
  Author: cperciva <cperciva at FreeBSD.org>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M etc/defaults/rc.conf
    M etc/rc
    M share/man/man5/rc.conf.5
    M share/man/man8/rc.8
    M sys/sys/param.h

  Log Message:
  -----------
  MFC r256775,r256776:
  Add support for "first boot" rc.d scripts.

  Document this new functionality in rc.conf(5) and rc(8).

  Bump __FreeBSD_version so that ports can make use of this.

Approved by:	re (gjb)


  Commit: 3f78c32610ee2416873e312c436f7460914a4935
      https://github.com/pcbsd/freebsd/commit/3f78c32610ee2416873e312c436f7460914a4935
  Author: cperciva <cperciva at FreeBSD.org>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  MFC r256921:
  Thou shalt not leak build host state into the system being compiled.

Approved by:	re (gjb)


  Commit: 11a75eb16653904a69065dc9eb2c02c32ed449c2
      https://github.com/pcbsd/freebsd/commit/11a75eb16653904a69065dc9eb2c02c32ed449c2
  Author: gjb <gjb at FreeBSD.org>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  Revert r256944, which does not quite get the src/ directory correct.

Discussed with:	cperciva
Approved by:	re (implicit)
Pointyhat:	gjb


  Commit: 8f0de933137355baabf4f2a1dad416843e634a41
      https://github.com/pcbsd/freebsd/commit/8f0de933137355baabf4f2a1dad416843e634a41
  Author: jmg <jmg at FreeBSD.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M etc/defaults/rc.conf
    M etc/rc.d/sendmail
    M etc/sendmail/freebsd.mc
    M share/man/man8/rc.sendmail.8

  Log Message:
  -----------
  MFC r256773:
Enable the automatic creation of a certificate (if one does not exists)
and enable the usage by sendmail if sendmail is enabled.

Reviewed by:    gshapiro
Approved by:	re (gjb)


  Commit: caa64dbe94775328829119d3737c0b4e2bbd543c
      https://github.com/pcbsd/freebsd/commit/caa64dbe94775328829119d3737c0b4e2bbd543c
  Author: brooks <brooks at FreeBSD.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M contrib/mtree/compare.c
    M contrib/mtree/create.c
    M contrib/mtree/getid.c
    M contrib/mtree/spec.c

  Log Message:
  -----------
  MFC r256687:

Upgrade to the latest version of mtree from NetBSD.  This revision
re-removes the printing of size for non-regular files, supports
type-less root (.) entries as seen in a couple ports, and corrects a bug
in -N that caused expanded Subversion $FreeBSD$ strings in comments to
be processed as /etc/group entries.

Includes one trivial portability fix (including <stdint.h> in three
files) that has been committed upstream.

Approved by:	re (glebius)


  Commit: 817f3323c4ae6c5685c1bde18aeac92153ab3fd5
      https://github.com/pcbsd/freebsd/commit/817f3323c4ae6c5685c1bde18aeac92153ab3fd5
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M UPDATING
    M lib/libyaml/Makefile
    R lib/libyaml/libbsdyml.3
    M share/mk/bsd.libnames.mk
    M tools/make_libdeps.sh
    M usr.sbin/pkg/Makefile
    M usr.sbin/pkg/config.c

  Log Message:
  -----------
  MFC r256450:

  Rename libbsdyml to libyaml, make private, and bump
  SHLIB_MAJOR to 1.0

Approved by:	bapt
Approved by:	re (glebius)


  Commit: be939ca962d3012cea3d32385af7527e0ce5c525
      https://github.com/pcbsd/freebsd/commit/be939ca962d3012cea3d32385af7527e0ce5c525
  Author: delphij <delphij at FreeBSD.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M lib/libc/iconv/citrus_mapper.c

  Log Message:
  -----------
  MFC r256833:

Drop cm_lock before calling mapper_close, which in turn could call
_citrus_mapper_close again and result in a deadlock otherwise.

This is similar to NetBSD PR/24023 (fixed in their r1.5 of this file).

PR:		bin/182994
Submitted by:	Fabian Keil <fk fabiankeil de>
Approved by:	re (hrs)


  Commit: 110ec3f7e38eb87529f8a17b5e5a207378bce219
      https://github.com/pcbsd/freebsd/commit/110ec3f7e38eb87529f8a17b5e5a207378bce219
  Author: hselasky <hselasky at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M sys/dev/usb/controller/musb_otg.c
    M sys/dev/usb/controller/musb_otg.h

  Log Message:
  -----------
  MFC r256548:
Correct programming of XXX_MAXP register. This register is 16-bit wide
and not 8-bit. Fix support for isochronous transfers in USB host mode.
Fix a whitespace while at it.

PR:		usb/181987
Approved by:	re (Xin Li)


  Commit: f15d281428aaade7000ee358c88389011c7398b8
      https://github.com/pcbsd/freebsd/commit/f15d281428aaade7000ee358c88389011c7398b8
  Author: hselasky <hselasky at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M sys/dev/usb/usbdevs
    M sys/dev/usb/wlan/if_run.c

  Log Message:
  -----------
  MFC r256500:
Add new USB ID.

PR:		usb/182936
Approved by:	re (Xin LI)
Obtainedrom:


  Commit: 5411f6951ede72a782138783542ebb0cff454b91
      https://github.com/pcbsd/freebsd/commit/5411f6951ede72a782138783542ebb0cff454b91
  Author: mav <mav at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M sys/cam/cam_xpt.c

  Log Message:
  -----------
  MFC r256533:
Unhide "Serial Number" lines from bootverbose.  That information may
be useful for system administration to have in hard copy (in logs) if
one of several devices suddenly dies.

Approved by:	re (hrs)


  Commit: c896ef2cccb7601faf5c79451228435a0717d08b
      https://github.com/pcbsd/freebsd/commit/c896ef2cccb7601faf5c79451228435a0717d08b
  Author: mav <mav at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M sys/cam/ata/ata_all.c
    M sys/cam/ata/ata_all.h
    M sys/cam/ata/ata_da.c
    M sys/cam/ata/ata_pmp.c
    M sys/cam/cam_periph.c
    M sys/cam/cam_periph.h
    M sys/cam/cam_xpt.c
    M sys/cam/cam_xpt_periph.h
    M sys/cam/scsi/scsi_all.c
    M sys/cam/scsi/scsi_all.h
    M sys/cam/scsi/scsi_cd.c
    M sys/cam/scsi/scsi_ch.c
    M sys/cam/scsi/scsi_da.c
    M sys/cam/scsi/scsi_enc.c
    M sys/cam/scsi/scsi_pass.c
    M sys/cam/scsi/scsi_pt.c
    M sys/cam/scsi/scsi_sa.c
    M sys/cam/scsi/scsi_sg.c

  Log Message:
  -----------
  MFC r256552:
Unify periph invalidation and destruction reporting.
Print message containing device model and serial number on invalidation.

Approved by:	re (hrs)


  Commit: 0fb83d0f206d137ea574c6adc087d72fca2a513b
      https://github.com/pcbsd/freebsd/commit/0fb83d0f206d137ea574c6adc087d72fca2a513b
  Author: bdrewery <bdrewery at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M Makefile.inc1

  Log Message:
  -----------
  MFC r256842:

  Fix 'make delete-old-libs' and 'make check-libs' to delete .debug
  files created by WITH_DEBUG_FILES. Also cleanup .symbols files from
  the period between r244236 when .symbols were supported and r251512
  when they were renamed to .debug.

  Only propose to delete a .debug file if the corresponding library
  itself was deleted already.

Approved by:	bapt
Approved by:	re (glebius)


  Commit: 43cd197a0d5467cc3116e8b4d4190d5b88e73e61
      https://github.com/pcbsd/freebsd/commit/43cd197a0d5467cc3116e8b4d4190d5b88e73e61
  Author: smh <smh at FreeBSD.org>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c

  Log Message:
  -----------
  MFC r256889:

Use the vdev's ashift to calculate the supported min block size passed to
zio_compress_data(..) when compressing l2arc buffers.

This eliminates L2ARC I/O errors, which resulted in very poor performance on
vdev's configured with block size greater than 512b due to compression
assuming a smaller min block size than the vdev supports.

Approved by:	re (glebius)


  Commit: 04fdff3ee16d842d845250e78d7bc7bb7347a839
      https://github.com/pcbsd/freebsd/commit/04fdff3ee16d842d845250e78d7bc7bb7347a839
  Author: hselasky <hselasky at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M sys/dev/usb/controller/xhci.c

  Log Message:
  -----------
  MFC r256750:
Improve XHCI stability. When a command timeout happens, the command
should be aborted else the command queue can stop. Refer to section
"4.6.1.2" of the XHCI specification.

Approved by:	re (glebius)


  Commit: 19e284f6516fc91d27b804bf63aee9d9b19cf6b9
      https://github.com/pcbsd/freebsd/commit/19e284f6516fc91d27b804bf63aee9d9b19cf6b9
  Author: tijl <tijl at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M include/pthread.h

  Log Message:
  -----------
  MFC r256925:

Add a dummy statement to the beginning of the pthread_cleanup_pop() macro
to allow a call of the macro to be labelled as in:

label:
  pthread_cleanup_pop();

Reviewed by:	imp
Approved by:	re (glebius)


  Commit: f2cf20f78fcdd44d412de89a584d6d98ef5c585c
      https://github.com/pcbsd/freebsd/commit/f2cf20f78fcdd44d412de89a584d6d98ef5c585c
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M sys/fs/devfs/devfs_vnops.c

  Log Message:
  -----------
  MFC r256501:
Remove two instances of ARGSUSED comment, and wrap lines nearby the
code that is to be changed.

Approved by:	re (glebius)


  Commit: 3056ea94bbf733ca0aeeb7772efef40884382338
      https://github.com/pcbsd/freebsd/commit/3056ea94bbf733ca0aeeb7772efef40884382338
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M sys/fs/devfs/devfs_vnops.c
    M sys/kern/sys_generic.c
    M sys/sys/systm.h

  Log Message:
  -----------
  MFC r256502:
Similar to debug.iosize_max_clamp sysctl, introduce
devfs_iosize_max_clamp sysctl, which allows/disables SSIZE_MAX-sized
i/o requests on the devfs files.

Approved by:	re (glebius)


  Commit: 47b928f216400825cad00e3435e0c50fcb7ebb58
      https://github.com/pcbsd/freebsd/commit/47b928f216400825cad00e3435e0c50fcb7ebb58
  Author: kib <kib at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M sys/kern/kern_exec.c
    M sys/sys/param.h

  Log Message:
  -----------
  MFC r256504:
Add a sysctl kern.disallow_high_osrel which disables executing the
images compiled on the world with higher major version number than the
high version number of the booted kernel.  Default to disable.

Approved by:	re (glebius)


  Commit: c26ecf05552e3861de3293801d85fe44f236b115
      https://github.com/pcbsd/freebsd/commit/c26ecf05552e3861de3293801d85fe44f236b115
  Author: grehan <grehan at FreeBSD.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M usr.sbin/bhyve/pci_ahci.c
    M usr.sbin/bhyve/pci_virtio_block.c

  Log Message:
  -----------
  MFC r256926, r257005

r256926
  Fix AHCI ATAPI emulation when backed with /dev/cd0

  - remove assumption that the backing file/device had
    512-byte sectors
  - fix incorrect iovec size variable that would result
    in a buffer overrun when an o/s issued an i/o request
    with more s/g elements than the blockif api

r257005
  Export the block size capability to guests.
  - Use #defines for capability bits
  - Export the VTBLK_F_BLK_SIZE capability
  - Fix bug in calculating capacity: it is in
    512-byte units, not the underlying sector size

  This allows virtio-blk to have backing devices
  with non 512-byte sector sizes e.g. /dev/cd0, and
  4K-block harddrives.

Approved by:  re (glebius)


  Commit: dbff34bea47c6fc0362836208a898436e57b806e
      https://github.com/pcbsd/freebsd/commit/dbff34bea47c6fc0362836208a898436e57b806e
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M ObsoleteFiles.inc
    M UPDATING
    M bin/freebsd-version/freebsd-version.sh.in
    M contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
    M etc/Makefile
    R etc/atf/FreeBSD.conf
    R etc/atf/Makefile
    R etc/atf/common.conf
    M etc/defaults/rc.conf
    M etc/ftpusers
    M etc/group
    M etc/master.passwd
    M etc/mtree/BSD.root.dist
    M etc/mtree/BSD.usr.dist
    M etc/rc.d/initrandom
    M etc/rc.d/jail
    M lib/clang/clang.build.mk
    M lib/libcrypt/tests/crypt_tests.c
    M sbin/camcontrol/modeedit.c
    M share/Makefile
    R share/atf/Makefile
    M share/examples/Makefile
    R share/examples/atf/Makefile
    M share/examples/kld/random_adaptor/random_adaptor_example.c
    M share/man/man4/random.4
    M share/man/man5/Makefile
    M share/man/man5/rc.conf.5
    M share/man/man7/Makefile
    M share/misc/bsd-family-tree
    M share/mk/atf.test.mk
    M share/syscons/keymaps/INDEX.keymaps
    R share/xml/Makefile
    R share/xml/Makefile.inc
    R share/xml/atf/Makefile
    R share/xsl/Makefile
    R share/xsl/Makefile.inc
    R share/xsl/atf/Makefile
    M sys/amd64/conf/GENERIC
    M sys/arm/versatile/versatile_pci.c
    M sys/boot/forth/loader.conf
    M sys/conf/NOTES
    M sys/conf/files
    M sys/conf/files.amd64
    M sys/conf/files.i386
    M sys/conf/newvers.sh
    M sys/conf/options
    M sys/dev/ata/ata-all.c
    M sys/dev/ata/ata-card.c
    M sys/dev/bxe/bxe.c
    M sys/dev/bxe/bxe_stats.c
    M sys/dev/bxe/ecore_sp.h
    M sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
    M sys/dev/glxsb/glxsb.c
    M sys/dev/hifn/hifn7751.c
    M sys/dev/hyperv/include/hyperv.h
    M sys/dev/hyperv/netvsc/hv_net_vsc.h
    M sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
    M sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
    M sys/dev/hyperv/vmbus/hv_channel.c
    A sys/dev/random/dummy_rng.c
    M sys/dev/random/harvest.c
    M sys/dev/random/hash.h
    M sys/dev/random/ivy.c
    A sys/dev/random/live_entropy_sources.c
    A sys/dev/random/live_entropy_sources.h
    M sys/dev/random/nehemiah.c
    R sys/dev/random/pseudo_rng.c
    M sys/dev/random/random_adaptors.c
    M sys/dev/random/random_adaptors.h
    M sys/dev/random/random_harvestq.c
    M sys/dev/random/random_harvestq.h
    M sys/dev/random/randomdev.c
    M sys/dev/random/randomdev.h
    M sys/dev/random/randomdev_soft.c
    M sys/dev/random/randomdev_soft.h
    A sys/dev/random/rwfile.c
    A sys/dev/random/rwfile.h
    M sys/dev/random/yarrow.c
    M sys/dev/random/yarrow.h
    M sys/dev/rndtest/rndtest.c
    M sys/dev/safe/safe.c
    M sys/dev/syscons/scmouse.c
    M sys/dev/syscons/syscons.c
    M sys/dev/ubsec/ubsec.c
    M sys/dev/vmware/vmxnet3/if_vmx.c
    M sys/dev/vmware/vmxnet3/if_vmxvar.h
    M sys/i386/conf/GENERIC
    M sys/ia64/conf/GENERIC
    M sys/kern/kern_intr.c
    M sys/kern/subr_bus.c
    M sys/mips/cavium/octeon_rnd.c
    M sys/modules/random/Makefile
    M sys/net/if_ethersubr.c
    M sys/net/if_tun.c
    M sys/netgraph/ng_iface.c
    M sys/powerpc/conf/GENERIC
    M sys/powerpc/conf/GENERIC64
    M sys/sparc64/conf/GENERIC
    M sys/sys/param.h
    M sys/sys/random.h
    M tools/build/mk/OptionalObsoleteFiles.inc
    M usr.bin/atf/Makefile
    M usr.bin/atf/Makefile.inc
    R usr.bin/atf/atf-config/Makefile
    R usr.bin/atf/atf-report/Makefile
    R usr.bin/atf/atf-run/Makefile
    R usr.bin/atf/atf-version/Makefile
    M usr.sbin/bhyve/pci_virtio_block.c
    M usr.sbin/bsdconfig/include/messages.subr
    M usr.sbin/bsdconfig/share/Makefile
    M usr.sbin/bsdconfig/share/device.subr
    M usr.sbin/bsdconfig/share/dialog.subr
    A usr.sbin/bsdconfig/share/keymap.subr
    M usr.sbin/bsdconfig/share/strings.subr
    M usr.sbin/bsdconfig/share/variable.subr
    M usr.sbin/bsdinstall/bsdinstall
    M usr.sbin/bsdinstall/bsdinstall.8
    M usr.sbin/bsdinstall/scripts/Makefile
    M usr.sbin/bsdinstall/scripts/auto
    M usr.sbin/bsdinstall/scripts/config
    A usr.sbin/bsdinstall/scripts/entropy
    M usr.sbin/bsdinstall/scripts/jail
    M usr.sbin/bsdinstall/scripts/keymap
    M usr.sbin/bsdinstall/scripts/netconfig
    M usr.sbin/bsdinstall/scripts/script
    M usr.sbin/bsdinstall/scripts/services
    A usr.sbin/bsdinstall/scripts/zfsboot
    M usr.sbin/jail/command.c
    M usr.sbin/jail/config.c
    M usr.sbin/jail/jail.8
    M usr.sbin/jail/jail.c
    M usr.sbin/jail/jailp.h

  Log Message:
  -----------
  Merge branch 'stable/10' of github.com:pcbsd/freebsd into stable/10


  Commit: 64f96eccdda0a6701310631304c74dc2186c7f54
      https://github.com/pcbsd/freebsd/commit/64f96eccdda0a6701310631304c74dc2186c7f54
  Author: Kris Moore <kris at pcbsd.org>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M Makefile.inc1
    M ObsoleteFiles.inc
    M UPDATING
    M contrib/mtree/compare.c
    M contrib/mtree/create.c
    M contrib/mtree/getid.c
    M contrib/mtree/spec.c
    M etc/defaults/rc.conf
    M etc/rc
    M etc/rc.d/jail
    M etc/rc.d/sendmail
    M etc/sendmail/freebsd.mc
    M include/pthread.h
    M lib/libc/iconv/citrus_mapper.c
    M lib/libvmmapi/vmmapi.c
    M lib/libyaml/Makefile
    R lib/libyaml/libbsdyml.3
    M share/man/man5/rc.conf.5
    M share/man/man8/rc.8
    M share/man/man8/rc.sendmail.8
    M share/mk/bsd.libnames.mk
    M sys/amd64/amd64/pmap.c
    M sys/amd64/include/vmm.h
    M sys/amd64/vmm/intel/vmx.c
    M sys/amd64/vmm/intel/vmx.h
    M sys/amd64/vmm/intel/vmx_controls.h
    M sys/amd64/vmm/vmm_dev.c
    M sys/amd64/vmm/x86.c
    M sys/boot/i386/btx/btx/btx.S
    M sys/cam/ata/ata_all.c
    M sys/cam/ata/ata_all.h
    M sys/cam/ata/ata_da.c
    M sys/cam/ata/ata_pmp.c
    M sys/cam/cam_periph.c
    M sys/cam/cam_periph.h
    M sys/cam/cam_xpt.c
    M sys/cam/cam_xpt_periph.h
    M sys/cam/scsi/scsi_all.c
    M sys/cam/scsi/scsi_all.h
    M sys/cam/scsi/scsi_cd.c
    M sys/cam/scsi/scsi_ch.c
    M sys/cam/scsi/scsi_da.c
    M sys/cam/scsi/scsi_enc.c
    M sys/cam/scsi/scsi_pass.c
    M sys/cam/scsi/scsi_pt.c
    M sys/cam/scsi/scsi_sa.c
    M sys/cam/scsi/scsi_sg.c
    M sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
    M sys/conf/files
    M sys/conf/newvers.sh
    R sys/contrib/rdma/core_priv.h
    R sys/contrib/rdma/ib_addr.h
    R sys/contrib/rdma/ib_cache.h
    R sys/contrib/rdma/ib_cm.h
    R sys/contrib/rdma/ib_fmr_pool.h
    R sys/contrib/rdma/ib_mad.h
    R sys/contrib/rdma/ib_marshall.h
    R sys/contrib/rdma/ib_pack.h
    R sys/contrib/rdma/ib_sa.h
    R sys/contrib/rdma/ib_smi.h
    R sys/contrib/rdma/ib_umem.h
    R sys/contrib/rdma/ib_user_cm.h
    R sys/contrib/rdma/ib_user_mad.h
    R sys/contrib/rdma/ib_user_sa.h
    R sys/contrib/rdma/ib_user_verbs.h
    R sys/contrib/rdma/ib_verbs.h
    R sys/contrib/rdma/iw_cm.h
    M sys/contrib/rdma/krping/getopt.c
    M sys/contrib/rdma/krping/krping.c
    M sys/contrib/rdma/krping/krping.h
    M sys/contrib/rdma/krping/krping_dev.c
    R sys/contrib/rdma/rdma_addr.c
    R sys/contrib/rdma/rdma_cache.c
    R sys/contrib/rdma/rdma_cm.h
    R sys/contrib/rdma/rdma_cm_ib.h
    R sys/contrib/rdma/rdma_cma.c
    R sys/contrib/rdma/rdma_device.c
    R sys/contrib/rdma/rdma_iwcm.c
    R sys/contrib/rdma/rdma_user_cm.h
    R sys/contrib/rdma/rdma_verbs.c
    R sys/contrib/rdma/types.h
    M sys/dev/cxgbe/adapter.h
    M sys/dev/cxgbe/common/common.h
    R sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu
    A sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
    M sys/dev/cxgbe/firmware/t4fw_cfg.txt
    M sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
    M sys/dev/cxgbe/firmware/t4fw_interface.h
    R sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu
    A sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
    M sys/dev/cxgbe/firmware/t5fw_cfg.txt
    M sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
    A sys/dev/cxgbe/iw_cxgbe/cm.c
    A sys/dev/cxgbe/iw_cxgbe/cq.c
    A sys/dev/cxgbe/iw_cxgbe/device.c
    A sys/dev/cxgbe/iw_cxgbe/ev.c
    A sys/dev/cxgbe/iw_cxgbe/id_table.c
    A sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
    A sys/dev/cxgbe/iw_cxgbe/mem.c
    A sys/dev/cxgbe/iw_cxgbe/provider.c
    A sys/dev/cxgbe/iw_cxgbe/qp.c
    A sys/dev/cxgbe/iw_cxgbe/resource.c
    A sys/dev/cxgbe/iw_cxgbe/t4.h
    A sys/dev/cxgbe/iw_cxgbe/user.h
    M sys/dev/cxgbe/t4_main.c
    M sys/dev/cxgbe/t4_sge.c
    M sys/dev/cxgbe/tom/t4_cpl_io.c
    M sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
    M sys/dev/hyperv/vmbus/hv_hv.c
    M sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
    M sys/dev/usb/controller/musb_otg.c
    M sys/dev/usb/controller/musb_otg.h
    M sys/dev/usb/controller/xhci.c
    M sys/dev/usb/usbdevs
    M sys/dev/usb/wlan/if_run.c
    M sys/dev/xen/blkfront/blkfront.c
    M sys/fs/devfs/devfs_vnops.c
    M sys/kern/kern_exec.c
    M sys/kern/sys_generic.c
    M sys/modules/cxgbe/Makefile
    A sys/modules/cxgbe/iw_cxgbe/Makefile
    M sys/modules/cxgbe/t4_firmware/Makefile
    M sys/modules/cxgbe/t5_firmware/Makefile
    M sys/modules/random/Makefile
    M sys/modules/rdma/Makefile
    R sys/modules/rdma/addr/Makefile
    R sys/modules/rdma/cma/Makefile
    R sys/modules/rdma/core/Makefile
    R sys/modules/rdma/iwcm/Makefile
    M sys/ofed/drivers/net/mlx4/en_netdev.c
    M sys/ofed/include/linux/gfp.h
    M sys/powerpc/powermac/ata_kauai.c
    M sys/powerpc/powermac/ata_macio.c
    M sys/sys/param.h
    M sys/sys/systm.h
    M sys/xen/xen-os.h
    M tools/make_libdeps.sh
    M usr.sbin/bhyve/bhyverun.c
    M usr.sbin/bhyve/bhyverun.h
    M usr.sbin/bhyve/mptbl.c
    M usr.sbin/bhyve/pci_ahci.c
    M usr.sbin/bhyve/pci_hostbridge.c
    M usr.sbin/bhyve/pci_virtio_block.c
    M usr.sbin/bhyve/pci_virtio_net.c
    M usr.sbin/bhyve/rtc.c
    M usr.sbin/bhyve/spinup_ap.c
    M usr.sbin/bhyvectl/bhyvectl.c
    M usr.sbin/bsdinstall/bsdinstall.8
    R usr.sbin/bsdinstall/scripts/docsinstall
    A usr.sbin/bsdinstall/scripts/docsinstall
    A usr.sbin/bsdinstall/scripts/entropy
    R usr.sbin/bsdinstall/scripts/entropy
    M usr.sbin/pkg/Makefile
    M usr.sbin/pkg/config.c

  Log Message:
  -----------
  Merge branch 'stable/10' of https://github.com/freebsd/freebsd into stable/10

Conflicts:
	etc/rc


Compare: https://github.com/pcbsd/freebsd/compare/e3393d7436be...64f96eccdda0


More information about the Commits mailing list