From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 16 Jul 2015 18:34:46 +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~319^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aae3e8f047d8f58f348a0dc5ab0c46a2c68a342c;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: (335 commits)
  uek-rpm: configs: enable compilation for RDS
  uek-rpm: enable mlx4_vnic module config
  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.
  ...
---

aae3e8f047d8f58f348a0dc5ab0c46a2c68a342c