]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.mlnx2.4-p3.orclFixes' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Fri, 11 Sep 2015 17:15:28 +0000 (10:15 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Fri, 11 Sep 2015 17:15:28 +0000 (10:15 -0700)
* 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

1  2 
drivers/infiniband/core/device.c

Simple merge