[Pkg-ofed-commits] [dapl] 02/04: Merge tag 'upstream/2.1.2'

[Ana Beatriz Guerrero López]

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

ana pushed a commit to branch master
in repository dapl.

commit d96e367953772f3e141897bcd8a21f43db7c892c
Merge: 614eed3 525e0ca
Author: Ana Guerrero López <ana at ekaia.org>
Date:   Thu Sep 4 14:59:28 2014 +0200

    Merge tag 'upstream/2.1.2'
    
    Upstream version 2.1.2

 ChangeLog                                   |  522 ++
 Makefile.am                                 |  209 +-
 Makefile.in                                 | 4143 ++++++++++----
 NEWS                                        |    0
 README                                      |  120 +-
 README.mcm                                  |  206 +
 aclocal.m4                                  | 7981 +--------------------------
 config.h.in                                 |   70 +-
 configure                                   | 1120 ++--
 configure.in                                |  123 +-
 dapl.spec                                   |   75 +-
 dapl.spec.in                                |   73 +-
 dapl/common/dapl_adapter_util.h             |    9 +-
 dapl/common/dapl_debug.c                    |   14 +-
 dapl/common/dapl_ep_create.c                |   11 +-
 dapl/common/dapl_ep_free.c                  |    2 +-
 dapl/common/dapl_ep_modify.c                |    5 +-
 dapl/common/dapl_ep_post_rdma_write.c       |    2 +-
 dapl/common/dapl_evd_connection_callb.c     |    4 +-
 dapl/common/dapl_evd_cq_async_error_callb.c |    6 +-
 dapl/common/dapl_evd_dto_callb.c            |    4 +-
 dapl/common/dapl_evd_qp_async_error_callb.c |    7 +-
 dapl/common/dapl_evd_un_async_error_callb.c |    6 -
 dapl/common/dapl_evd_util.c                 |   59 +-
 dapl/common/dapl_evd_util.h                 |    5 +
 dapl/common/dapl_ia_open.c                  |   23 +-
 dapl/common/dapl_ia_query.c                 |    4 +-
 dapl/common/dapl_ia_util.c                  |    3 +-
 dapl/common/dapl_ring_buffer_util.c         |   12 +-
 dapl/include/dapl.h                         |    5 +
 dapl/include/dapl_debug.h                   |    9 +-
 dapl/openib_cma/cm.c                        |    5 +-
 dapl/openib_cma/device.c                    |  164 +-
 dapl/openib_common/cq.c                     |  238 +-
 dapl/openib_common/dapl_ib_common.h         |   79 +-
 dapl/openib_common/dapl_ib_dto.h            |   87 +-
 dapl/openib_common/dapl_mic_common.h        |  965 ++++
 dapl/openib_common/ib_extensions.c          |  150 +-
 dapl/openib_common/mem.c                    |   83 +-
 dapl/openib_common/qp.c                     |  330 +-
 dapl/openib_common/util.c                   |  126 +-
 dapl/{openib_ucm => openib_mcm}/cm.c        | 1485 +++--
 dapl/openib_mcm/dapl_ib_util.h              |  210 +
 dapl/{openib_ucm => openib_mcm}/device.c    |  345 +-
 dapl/openib_mcm/linux/openib_osd.h          |   37 +
 dapl/openib_mcm/mix.c                       | 1343 +++++
 dapl/openib_mcm/proxy.c                     |  501 ++
 dapl/openib_scm/cm.c                        |   89 +-
 dapl/openib_scm/device.c                    |  131 +-
 dapl/openib_ucm/cm.c                        |   61 +-
 dapl/openib_ucm/dapl_ib_util.h              |    4 +-
 dapl/openib_ucm/device.c                    |  226 +-
 dapl/svc/mcm.c                              | 1580 ++++++
 dapl/svc/mix.c                              | 2266 ++++++++
 dapl/svc/mpxy_in.c                          | 1209 ++++
 dapl/svc/mpxy_out.c                         | 1081 ++++
 dapl/svc/mpxyd.c                            | 1487 +++++
 dapl/svc/mpxyd.h                            |  832 +++
 dapl/svc/util.c                             |  745 +++
 dapl/udapl/dapl_init.c                      |   14 +-
 dapl/udapl/dapl_lmr_create.c                |    6 +-
 dapl/udapl/libdaplomcm.map                  |    7 +
 dapl/udapl/linux/dapl_osd.h                 |   61 +-
 dat/common/dat_api.c                        |   63 +-
 dat/common/dat_dr.c                         |   24 +
 dat/common/dat_dr.h                         |   11 +-
 dat/include/dat2/dat.h                      |    2 +
 dat/include/dat2/dat_ib_extensions.h        |   40 +-
 dat/udat/udat.c                             |  136 +-
 doc/mpxyd.conf                              |  177 +
 aclocal.m4 => m4/libtool.m4                 | 1584 +-----
 m4/ltoptions.m4                             |  368 ++
 m4/ltsugar.m4                               |  123 +
 m4/ltversion.m4                             |   23 +
 m4/lt~obsolete.m4                           |   92 +
 mpxyd.init.in                               |  107 +
 test/dapltest/Makefile.in                   |  527 +-
 test/dtest/Makefile.in                      |  103 +-
 test/dtest/dtest.c                          |  250 +-
 test/dtest/dtestcm.c                        |   13 +-
 80 files changed, 21325 insertions(+), 13097 deletions(-)

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