tree aa6a436505a6c495a8243165a336d3bd56f69f12
parent efac5ac052d91629e994ddec6771a7c413f067a0
parent d2acafea14e214421d08d9ae866c854feb47761d
author Jason Gunthorpe <jgg@mellanox.com> 1514436646 -0700
committer Jason Gunthorpe <jgg@mellanox.com> 1514436646 -0700

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