]> 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: f20aae9 4951ccc)
Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 13 Aug 2015 20:12:52 +0000 (13:12 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 13 Aug 2015 20:12:52 +0000 (13:12 -0700)
* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed:
  mlx4_vnic: Skip fip discover restart if pkey index not changed
  rds: rds_ib_device.refcount overflow
  rds_rdma: rds_sendmsg should return EAGAIN if connection not setup
  rds_rdma: allocate FMR according to max_item_soft
  rds_rdma: do not dealloc fmrs in the pool under use
  rds: set fmr pool dirty_count correctly


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.