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

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

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek:
  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