From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Wed, 21 Oct 2015 18:15:14 +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~251^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c79f25a794ecfbe2d9dfb767eb653863d411f5e8;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek-ofed:
  RDS-TCP: Reset tcp callbacks if re-using an outgoing socket in rds_tcp_accept_one()
  RDS: Invoke ->laddr_check() in rds_bind() for explicitly bound transports.
  RDS: rds_conn_lookup() should factor in the struct net for a match
  RDS: Use a single TCP socket for both send and receive.
  RDS-TCP: Do not bloat sndbuf/rcvbuf in rds_tcp_tune
  RDS-TCP: Set up MSG_MORE and MSG_SENDPAGE_NOTLAST as appropriate in rds_tcp_
  Revert "rds_rdma: rds_sendmsg should return EAGAIN if connection not setup"
  rds: make sure base connection is up on both sides
  rds_ib/iw: fixed big endianness conversion issue for dp->dp_ack_seq
  RDS: fix race condition when sending a message on unbound socket.
  RDS: verify the underlying transport exists before creating a connection
  mlx4: indicate memory resource exhaustion
  IB/mlx4: Use correct order of variables in log message
  mlx4_core: Introduce restrictions for PD update
---

c79f25a794ecfbe2d9dfb767eb653863d411f5e8