From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Wed, 26 Aug 2015 19:38:58 +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~293
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7f4e440ad8dbd9fcf819f9c9367e165072079974;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed:
  rds: print vendor error on error induced disconnect/re-connect
  rds: re-entry of rds_ib_xmit/rds_iw_xmit
  net/mlx4_vnic: Initialize new fields of mlx4_ib_qp
---

7f4e440ad8dbd9fcf819f9c9367e165072079974