Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 5c402355
    Linus Torvalds authored
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      MAINTAINERS: Remove Glenn Streiff from NetEffect entry
      mlx4_core: Improve error message when not enough UAR pages are available
      IB/mlx4: Add support for memory management extensions and local DMA L_Key
      IB/mthca: Keep free count for MTT buddy allocator
      mlx4_core: Keep free count for MTT buddy allocator
      mlx4_code: Add missing FW status return code
      IB/mlx4: Rename struct mlx4_lso_seg to mlx4_wqe_lso_seg
      mlx4_core: Add module parameter to enable QoS support
      RDMA/iwcm: Remove IB_ACCESS_LOCAL_WRITE from remote QP attributes
      IPoIB: Include err code in trace message for ib_sa_path_rec_get() failures
      IB/sa_query: Check if sm_ah is NULL in ib_sa_remove_one()
      IB/ehca: Release mutex in error path of alloc_small_queue_page()
      IB/ehca: Use default value for Local CA ACK Delay if FW returns 0
      IB/ehca: Filter PATH_MIG events if QP was never armed
      IB/iser: Add support for RDMA_CM_EVENT_ADDR_CHANGE event
      RDMA/cma: Add RDMA_CM_EVENT_TIMEWAIT_EXIT event
      RDMA/cma: Add RDMA_CM_EVENT_ADDR_CHANGE event
    5c402355