From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Fri, 4 Sep 2015 02:08:36 +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~287^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9c3ecc74333d2664cab5a8543d8a3be20903c4b0;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:
  IB/rds_rdma: unloading of ofed stack causes page fault panic
  RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.
  RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net
---

9c3ecc74333d2664cab5a8543d8a3be20903c4b0