From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Thu, 9 Jul 2015 22:49:38 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~319^2^2~3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=851335e0ca865a693201c86542003b12dbb8ff94;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed

* topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes:
  IB/ipoib: CSUM support in connected mode
  IB/ipoib: Scatter-Gather support in connected mode
  ib_uverbs: Support for kernel implementation of XRC calls from user space
  ib_{uverbs/core}: add new ib_create_qp_ex with udata arg
  ib_uverbs: Avoid vendor specific masking of attributes in query_qp
  ib_uverbs: Add padding to end align ib_uverbs_reg_mr_resp
  ib: Add udata argument to create_ah
  ib_umem: Add a new, more generic ib_umem_get_attrs
  ib_mad: incoming sminfo SMPs gets discarded if no process_mad function is registered
  mlx4_core: More support for automatically scaling profile parameters
  ipoib: rfe- enable pkey and device name decoupling
  ib_sdp: adding sdp socket support to rdma_cm
  mlx4_vnic: set mod param "lro_num" default value to 0 to disable LRO feature
  mlx4_vnic: Add correct typecasting to pointers in vnic_get_frag_header()
  rdma_cm: CMA_QUERY_HANDLER: BAD STATUS -110 and -22
  RDMA CM: Avoid possible SEGV during connection shutdown
  rdma_cm: extend debug for remote mapping
---

851335e0ca865a693201c86542003b12dbb8ff94