The following changes since commit d8b2ba7c5928173fe1c12bd2545f5ed85d1c3c7a:
IB/core: Destroy ocrdma_dev_id IDR on module exit (2015-07-14 13:20:16
-0400)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git
tags/for-linus
for you to fetch changes up to b8f5595eb96c9fce1c907d13e89581e5061edf2e:
RDMA/ocrdma: update ocrdma module license string (2015-07-24 11:34:41
-0400)
----------------------------------------------------------------
Changes for 4.2-rc
- Two minor bug fixes
- Relicense ocrdma driver to dual license, GPL or BSD
----------------------------------------------------------------
Devesh Sharma (2):
RDMA/ocrdma: update ocrdma license to dual-license
RDMA/ocrdma: update ocrdma module license string
Jason Gunthorpe (1):
IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM
Steve Wise (1):
RDMA/cxgb3: fail get_dma_mr on 64 bit arches
drivers/infiniband/hw/cxgb3/iwch_provider.c | 4 +++
drivers/infiniband/hw/ocrdma/ocrdma.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_abi.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_main.c | 55
++++++++++++++++++-----------
drivers/infiniband/hw/ocrdma/ocrdma_sli.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_stats.h | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 53
+++++++++++++++++----------
drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 53
+++++++++++++++++----------
drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +-
14 files changed, 415 insertions(+), 230 deletions(-)
--
Doug Ledford <dledford@xxxxxxxxxx>
GPG KeyID: 0E572FDD
Attachment:
signature.asc
Description: OpenPGP digital signature
