]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b84b7d8 376184b)
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:34:52 +0000 (14:34 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 11 Sep 2015 21:34:52 +0000 (14:34 -0700)
* '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

1  2 
drivers/infiniband/ulp/srp/ib_srp.c patch | diff1 | diff2 | blob | history

diff --cc drivers/infiniband/ulp/srp/ib_srp.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.