]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 12 Aug 2015 22:45:14 +0000 (15:45 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Wed, 12 Aug 2015 22:45:14 +0000 (15:45 -0700)
* topic/uek-4.1/ofed.rds-p2:
  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