Merge ^/head r314129 through r314177.
authordim <dim@FreeBSD.org>
Thu, 23 Feb 2017 19:32:25 +0000 (19:32 +0000)
committerdim <dim@FreeBSD.org>
Thu, 23 Feb 2017 19:32:25 +0000 (19:32 +0000)
commit8bf074f3b10b171ed00cb0ed2964f81ed8647366
tree81dbdadebc12572b62ddcdc9133386f37e7f6eb8
parent36e9e3ef20a9ac8ff9755ab1dfc4a01c079b9928
Merge ^/head r314129 through r314177.
31 files changed:
cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c
contrib/ofed/libcxgb4/src/dev.c
contrib/ofed/libcxgb4/src/qp.c
contrib/ofed/libcxgb4/src/t4.h
contrib/ofed/libcxgb4/src/t4_chip_type.h
contrib/ofed/libcxgb4/src/t4_pci_id_tbl.h
contrib/ofed/libcxgb4/src/t4_regs.h
contrib/ofed/libcxgb4/src/verbs.c
etc/devd.conf
lib/libcompiler_rt/Makefile
sys/compat/linux/linux_misc.h
sys/compat/linuxkpi/common/include/linux/bitops.h
sys/dev/bktr/bktr_core.c
sys/dev/ce/ceddk.c
sys/dev/cxgbe/iw_cxgbe/device.c
sys/dev/cxgbe/iw_cxgbe/mem.c
sys/dev/cxgbe/iw_cxgbe/provider.c
sys/dev/rt/if_rt.c
sys/dev/vxge/vxge.c
sys/dev/vxge/vxgehal/vxgehal-config.c
sys/dev/xen/gntdev/gntdev.c
sys/dev/xen/netback/netback.c
sys/dev/xen/netback/netback_unit_tests.c
sys/modules/iwm/Makefile
sys/netinet/tcp_output.c
sys/ofed/drivers/infiniband/core/uverbs_main.c
usr.bin/vi/catalog/Makefile
usr.sbin/camdd/camdd.c
usr.sbin/rtadvd/config.c