From: Jason Gunthorpe <jgg@mellanox.com>
Date: Thu, 28 Dec 2017 04:50:46 +0000 (-0700)
Subject: Merge branch 'from-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=76a895d9e1332ca3cfa3edff3dc04420dfd7d603;p=linux.git

Merge branch 'from-rc' of git://git./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
---

76a895d9e1332ca3cfa3edff3dc04420dfd7d603