From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 13 Aug 2015 20:12:52 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed into... 
X-Git-Tag: v4.1.12-92~305^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=707892457b0d1438dab0a13d10c5336eab65466a;p=users%2Fjedix%2Flinux-maple.git

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

* '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
---

707892457b0d1438dab0a13d10c5336eab65466a