Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Check correct variable for allocation failure
  RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp()
  RDMA/cm: Set num_paths when manually assigning path records
  IB/cm: Fix device_create() return value check

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

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

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

diff --cc drivers/infiniband/hw/nes/nes_verbs.c
Simple merge