From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Fri, 11 Sep 2015 17:15:28 +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~281^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=376184b57843fc158f365d0aa83d424daa93ff01;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_core: Usermode FMR config params
  ib_core: User mode FMR fixes 2012-06-11
  ib/srp: Enable usermode FMR
  ib/iser: Enable usermode FMR
  ib/mlx4: Enable usermode FMR
  ib/core: Enable usermode FMR
  ib/core: init shared-pd ref count to 1, and add cleanup
  IB/Shared PD support from Oracle
---

376184b57843fc158f365d0aa83d424daa93ff01