pop (CONFLICT)

diff --git a/meta b/meta
index e86a09d39d783327161a13cfa82abcb3311f9972..c12c44100bb98884144f8af62254bd219e09ff93 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: 56917bee72e85c187f6af6b14bf03cfbbc7e5fdd
+Previous: e04abbc11619c420ef585800e6023fd421e636f5
 Head: e3776dfac43e3529400730e48d41d35378d4cf72
 Applied:
+  ofed: e3776dfac43e3529400730e48d41d35378d4cf72
 Unapplied:
-  ofed: 4dd1e98bd219ab47737ef2ff681800c11e4d56cb
   sbin: 17db168e3614d6121f3f4bdd1c4f4bf3a939554a
   sa: cdfedcc65d4744238c19de2dc3fbf4ce3acde365
   ibacm-release-1-0-1: c4bd7c5eac50c89f0d9a4643eb8c7fea10ecc19d

diff --git a/patches/ofed b/patches/ofed
index 0a90ce34beda91e4ad94832113c114ba0c0815fa..77962d79480cab60fbeb02cbeffba6eedebba433 100644 (file)
--- a/patches/ofed
+++ b/patches/ofed
@@ -1,5 +1,5 @@
-Bottom: 087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Top:    9593c1ec8c636dfc98ed635f95b248f4373c2065
+Bottom: 63c8480d539098cda8a1004c1f5bac1b832a179f
+Top:    63c8480d539098cda8a1004c1f5bac1b832a179f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-21 09:08:39 -0700
 
@@ -10,92 +10,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/Makefile.am b/Makefile.am
-index 46f68d4..69c57c7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -8,14 +8,17 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
- svc_ib_acm_CFLAGS = $(AM_CFLAGS)
- util_ib_acme_CFLAGS = $(AM_CFLAGS)
- 
--ib_acmincludedir = $(includedir)/infiniband
-+ibacmincludedir = $(includedir)/infiniband
- 
--ib_acminclude_HEADERS = include/infiniband/acm.h
-+ibacminclude_HEADERS = include/infiniband/acm.h
- 
- man_MANS = \
-       man/ib_acme.1 \
-       man/ib_acm.1 \
-       man/ib_acm.7
- 
--EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
-+EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
-+           linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
- 
-+dist-hook: ibacm.spec
-+      cp ibacm.spec $(distdir)
-diff --git a/configure.in b/configure.in
-index 9311602..da59fdd 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,11 +1,11 @@
- dnl Process this file with autoconf to produce a configure script.\r
- \r
- AC_PREREQ(2.57)\r
--AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org)\r
-+AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org)\r
- AC_CONFIG_SRCDIR([src/acm.c])\r
- AC_CONFIG_AUX_DIR(config)\r
- AM_CONFIG_HEADER(config.h)\r
--AM_INIT_AUTOMAKE(ib_acm, 1.0.0)\r
-+AM_INIT_AUTOMAKE(ibacm, 1.0.0)\r
- \r
- AM_PROG_LIBTOOL\r
- \r
-@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long)
- dnl Checks for libraries\r
- if test "$disable_libcheck" != "yes"; then\r
- AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
--    AC_MSG_ERROR([ibv_get_device_list() not found.  ib_acm requires libibverbs.]))\r
-+    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
- AC_CHECK_LIB(ibumad, umad_send, [],\r
--    AC_MSG_ERROR([umad_send() not found.  ib_acm requires libibumad.]))\r
-+    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
- fi\r
- \r
- dnl Checks for header files.\r
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index 2c10e1c..5c89be3 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -1,6 +1,6 @@
- %define ver @VERSION@
- 
--Name: ib_acm
-+Name: ibacm
- Version: 1.0.0
- Release: 1%{?dist}
- Summary: InfiniBand Communication Manager Assistant
-@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- BuildRequires: libibverbs-devel >= 1.1-1
- 
- %description
--ib_acm assists with establishing communication over Infiniband.
-+ibacm assists with establishing communication over Infiniband.
- 
- %package svc
- Summary: IB CM pre-connection service application
-@@ -44,11 +44,9 @@ rm -rf $RPM_BUILD_ROOT
- %files
- %defattr(-,root,root,-)
- %doc AUTHORS COPYING README
--
--%files svc
--%defattr(-,root,root,-)
- %{_bindir}/*
- %{_mandir}/man1/*
- %{_mandir}/man7/*
-+%{_includedir}/infiniband/acm.h
- 
- %changelog
+