[Pkg-ofed-commits] [libfabric] 30/123: Merge pull request #1246 from shefty/v1.1.x

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to annotated tag v1.1.1
in repository libfabric.

commit 17a577c7848dde7e7536b096f3c5f1c5f94691e7
Merge: 00560a5 162ab5d
Author: Sean Hefty <sean.hefty at intel.com>
Date:   Thu Aug 27 14:54:31 2015 -0700

    Merge pull request #1246 from shefty/v1.1.x
    
    V1.1.x

 prov/psm/src/psmx.h              |  3 +-
 prov/psm/src/psmx_atomic.c       |  6 +--
 prov/psm/src/psmx_cq.c           | 11 ++++--
 prov/psm/src/psmx_init.c         | 12 ++++--
 prov/psm/src/psmx_msg2.c         |  2 +
 prov/psm/src/psmx_util.c         |  3 +-
 prov/psm/src/psmx_wait.c         |  7 +++-
 prov/sockets/src/sock.h          | 33 +++++++++++-----
 prov/sockets/src/sock_av.c       |  5 +--
 prov/sockets/src/sock_conn.c     | 36 ++++++++++++++----
 prov/sockets/src/sock_ep_dgram.c | 11 +++++-
 prov/sockets/src/sock_ep_msg.c   |  9 ++++-
 prov/sockets/src/sock_ep_rdm.c   |  7 ++++
 prov/sockets/src/sock_fabric.c   | 21 +++++++++-
 prov/usnic/src/usdf.h            |  8 ++++
 prov/usnic/src/usdf_cq.c         | 54 ++++++++++++++++++++++++--
 prov/usnic/src/usdf_msg.c        | 82 +++++++++++++++++++++++++++-------------
 prov/usnic/src/usdf_rdm.c        | 63 ++++++++++++++++++++++++------
 prov/verbs/src/fi_verbs.c        | 58 +++++++++++++++++-----------
 19 files changed, 333 insertions(+), 98 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libfabric.git