From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Wed, 26 Aug 2015 19:25:13 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed
X-Git-Tag: v4.1.12-92~293^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=06b0fe6a4204b2b1cb32d3e6e2139def0b82a5cd;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed

* topic/uek-4.1/ofed.rds-p2:
  rds: print vendor error on error induced disconnect/re-connect
  rds: re-entry of rds_ib_xmit/rds_iw_xmit
---

06b0fe6a4204b2b1cb32d3e6e2139def0b82a5cd