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

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

* topic/uek-4.1/ofed.rds-p2: (74 commits)
  Add getsockopt support for SO_RDS_TRANSPORT
  Add setsockopt support for SO_RDS_TRANSPORT
  Declare SO_RDS_TRANSPORT and RDS_TRANS_* constants in uapi/linux/rds.h
  RDS-TCP: only initiate reconnect attempt on outgoing TCP socket.
  RDS-TCP: Always create a new rds_sock for an incoming connection.
  rds: directly include header for vmalloc/vfree in ib_recv.c
  rds: return EMSGSIZE for oversize requests before processing/queueing
  net: rds: use correct size for max unacked packets and bytes
  RDS/IP: RDS takes 10 seconds to plumb the second IP back
  RDS/IB: Tune failover-on-reboot scheduling
  RDS: mark netdev UP for intfs added post module load
  RDS: Enable use of user named pkey devices
  rds: fix list corruption and tx hang when netfilter is used
  RDS: move more queing for loopback connections to separate queue
  RDS: add module parameter to allow module unload or not
  rds: fix NULL pointer dereference panic during rds module unload
  RDS:active bonding: disable failover across HCAs(failover groups)
  RDS/IB: active bonding - failover down interfaces on reboot.
  RDS/IB: Remove dangling rcu_read_unlock() and other cleanups
  rds: new extension header: rdma bytes
  ...

Conflicts:
	drivers/infiniband/ulp/ipoib/ipoib_main.c