CommitterLinus Torvalds (1)
AuthorLinus Torvalds (1)
Branchesmaster (1)


Linux/linux d739322 — drivers/infiniband/core uverbs_ioctl.c uverbs_cmd.c, drivers/infiniband/hw/mthca mthca_provider.c

by Linus Torvalds on ⎇
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

Pull rdma fixes frfom Jason Gunthorpe:
 "Not much so far. We have the usual batch of bugs and two fixes to code
  merged this cycle:

   - Restore valgrind support for the ioctl verbs interface merged this
     window, and fix a missed error code on an error path from that
     conversion

   - A user reported crash on obsolete mthca hardware

   - pvrdma was using the wrong command opcode toward the hypervisor

   - NULL pointer crash regression when dumping rdma-cm over netlink

   - Be conservative about exposing the global rkey"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/uverbs: Mark ioctl responses with UVERBS_ATTR_F_VALID_OUTPUT
  RDMA/mthca: Clear QP objects during their allocation
  RDMA/vmw_pvrdma: Return the correct opcode when creating WR
  RDMA/cma: Add cm_id restrack resource based on kernel or user cm_id type
  RDMA/nldev: Don't expose unsafe global rkey to regular user
  RDMA/uverbs: Fix post send success return value in case of error
DeltaFile
+49-13drivers/infiniband/core/uverbs_ioctl.c
+34-1drivers/infiniband/hw/vmw_pvrdma/pvrdma.h
+10-1drivers/infiniband/core/uverbs_cmd.c
+6-0drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
+4-1drivers/infiniband/core/cma.c
+0-4drivers/infiniband/core/nldev.c
+2-2drivers/infiniband/hw/mthca/mthca_provider.c
+2-0drivers/infiniband/core/rdma_core.h
+1-0include/uapi/rdma/vmw_pvrdma-abi.h
+1-0drivers/infiniband/core/uverbs_main.c
+109-2210 files

UnifiedSplitRaw