From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 17 Feb 2017 04:44:51 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~5
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3d60e64ce1c492b39fb59b5f171611917d0f54f9;p=users%2Fjedix%2Flinux-maple.git

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:
  Revert "RDS: Make message size limit compliant with spec"
  RDS: ActiveBonding: Make its own thread for active active
  RDS: correct condition check in reconnect_timeout()
  RDS: ActiveBonding: Create a cluster sync point for failback
---

3d60e64ce1c492b39fb59b5f171611917d0f54f9