]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/ofed.rds-p2' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Fri, 4 Sep 2015 02:08:36 +0000 (19:08 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Fri, 4 Sep 2015 02:08:36 +0000 (19:08 -0700)
* 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

1  2 
net/rds/ib.c

diff --cc net/rds/ib.c
Simple merge