From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 11 Sep 2015 21:34:52 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~281
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=25d691eba8169691ff1348aba2f8cf1bca4521f3;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek:
  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
---

25d691eba8169691ff1348aba2f8cf1bca4521f3