]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c32a140 fec2002)
Merge branch 'topic/uek-4.1/ofed.sdp' into topic/uek-4.1/ofed
authorMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:49:07 +0000 (05:49 -0700)
committerMukesh Kacker <mukesh.kacker@oracle.com>
Tue, 6 Oct 2015 12:49:07 +0000 (05:49 -0700)
* topic/uek-4.1/ofed.sdp:
  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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.