From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 8 Oct 2015 15:24:10 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~264
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=893a771d9b90127f3ec754ce20b60004f6f5ac28;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/ofed' of git://ca-git.us.oracle.com/linux-uek: (419 commits)
  uek-rpm: Enable config for OVN xsigo drivers
  Add Oracle virtual Networking Drivers for uek4 kernel
  ib_sdp/cma: readd SDP support to cma_save_net_info
  ib/sdp: Enable usermode FMR
  ib/sdp: fix null dereference of sk->sk_wq in sdp_rx_irq()
  sdp: fix keepalive functionality
  ib_sdp: fix deadlock when sdp_cma_handler is called while socket is being closed
  ib_sdp: add unhandled events to rdma_cm_event_str
  ib_sdp/uek-rpm: configs: enable compilation for sdp
  ib_sdp: porting sdp from uek2 to uek-4.1
  ib_sdp: remove APM code
  sdp: Kconfig and Makefile changes
  sdp: port the code to uek2
  sdp: added debug print for the event: RDMA_CM_EVENT_ALT_PATH_LOADED
  sdp: prepare support to kernel 2.6.39-200.1.1.el5uek: add macro to get sk_sleep
  sdp: add support to kernel 2.6.39-200.1.1.el5uek
  sdp: add [rt]x_bytes counters to sdpstats
  sdp: Fix Bug 114242 - Multi connection net_perf causes server to hang
  FMR: remove FMR failure messages
  sdp: make sdp memory leak print a debug
  ...
---

893a771d9b90127f3ec754ce20b60004f6f5ac28