Merge branch 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

Patches for 4.16 that are dependent on patches sent to 4.15-rc.

These are small clean ups for the vmw_pvrdma and i40iw drivers.

* 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git:
  RDMA/vmw_pvrdma: Remove usage of BIT() from UAPI header
  RDMA/vmw_pvrdma: Use refcount_t instead of atomic_t
  RDMA/vmw_pvrdma: Use more specific sizeof in kcalloc
  RDMA/vmw_pvrdma: Clarify QP and CQ is_kernel logic
  RDMA/vmw_pvrdma: Add UAR SRQ macros in ABI header file
  i40iw: Change accelerated flag to bool

diff --cc drivers/infiniband/core/cma.c
Simple merge

diff --cc drivers/infiniband/core/device.c
Simple merge

diff --cc drivers/infiniband/core/security.c
Simple merge

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/core/verbs.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/iw_cxgb4.h
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/cxgb4/t4.h
Simple merge

diff --cc drivers/infiniband/hw/hfi1/hfi.h
Simple merge

diff --cc drivers/infiniband/hw/hfi1/rc.c
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_device.h
Simple merge

diff --cc drivers/infiniband/hw/hns/hns_roce_hw_v2.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_cm.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_cm.h
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_ctrl.c
Simple merge

diff --cc drivers/infiniband/hw/i40iw/i40iw_d.h
Simple merge

diff --cc drivers/infiniband/hw/mlx4/qp.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/mr.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_ib.c
Simple merge