Version: 1
-Previous: 166e345dda42f8e0f18efc08e684d2e48dd2e804
-Head: 5d1d427db66b222debbe1fbc93c4f9136ea71cb8
+Previous: a258a336028cae5bdaf1a4e83d57f20a8cad68be
+Head: 62fc4bdee12905d85332875439240523fad7bee0
Applied:
af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
- rename-ibacm: 045b8745bb159da2fdeee216007c10f1a058d547
- refresh-temp: 5d1d427db66b222debbe1fbc93c4f9136ea71cb8
+ rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
Unapplied:
fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
+++ /dev/null
-Bottom: 2724258e9ed52f80159968b8b63216a7ba8595a6
-Top: b7ef43780109283b77986862aa8504222eb78bce
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-03-02 11:35:15 -0800
-
-Refresh of rename-ibacm
-
----
-
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index a926fea..ac7f06f 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -11,43 +11,80 @@ Url: http://www.openfabrics.org/
- Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
- BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
--BuildRequires: libibverbs-devel >= 1.1-1
-+BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
-+Requires(post): chkconfig
-+Requiers(preun): chkconfig
-+ExcludeArch: s390, s390x
-
- %description
--ibacm assists with establishing communication over Infiniband.
-+The ib_acm daemon helps reduce the load of managing path record lookups on
-+large InfiniBand fabrics by providing a user space implementation of what
-+is functionally similar to an ARP cache. The use of ib_acm, when properly
-+configured, can reduce the SA packet load of a large IB cluster from O(n^2)
-+to O(n). The ib_acm daemon is started and normally runs in the background,
-+user applications need not know about this daemon as long as their app
-+uses librdmacm to handle connection bring up/tear down. The librdmacm
-+library knows how to talk directly to the ib_acm daemon to retrieve data.
-
--%package svc
--Summary: IB CM pre-connection service application
--Group: System Environment/Libraries
--Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h
-+%package devel
-+Summary: Headers file needed when building apps to talk directly to ibacm.
-+Requires: %{name} = %{version}-%{release}
-
--%description svc
--Application daemon for IB CM pre-connection services.
-+%description devel
-+Most applications do not need to know how to talk directly to the ib_acm
-+daemon, but it does have a socket that it listens on, and it has a
-+specific protocol for incoming/outgoing data. So if you wish to build
-+the ability to communicate directly with ib_acm into your own application,
-+the protocol used to communicate with it, and the data structures
-+involved, are in this header file. Please note that this is an unsupported
-+method of using this daemon. The only supported means of using this is
-+via librdmacm. As such, even though this header file is provided, no
-+further documentation is available. One must read the source if they
-+wish to make use of this header file.
-
- %prep
- %setup -q -n %{name}-%{ver}
-
- %build
--%configure
-+aclocal -I config && libtoolize --force --copy && autoheader && \
-+ automake --foreign --add-missing --copy && autoconf
-+%configure --sysconfdir=/etc/rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
- make %{?_smp_mflags}
-
- %install
- rm -rf $RPM_BUILD_ROOT
-+make DESTDIR=%{buildroot} install
-+install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ibacm
- %makeinstall
-
- %clean
- rm -rf $RPM_BUILD_ROOT
-
--%post -p /sbin/ldconfig
--%postun -p /sbin/ldconfig
-+%post
-+if [ $1 = 1 ]; then
-+ chkconfig --add ibacm
-+fi
-+%preun
-+if [ $1 = 1 ]; then
-+ chkconfig --del ibacm
-+fi
-
- %files
- %defattr(-,root,root,-)
- %doc AUTHORS COPYING README
- %{_bindir}/ib_acme
--%{_sbindir}/ib_acm
-+%{_sbindir}/ibacm
- %{_mandir}/man1/*
- %{_mandir}/man7/*
-+%config(noreplace) %{_sysconfdir}/rdma/*
-+%{_initrddir}/ibacm
-+
-+%files devel
-+%defattr(-,root,root,-)
- %{_includedir}/infiniband/acm.h
-
- %changelog
-+* Tue Feb 28 2012 Doug Ledford <dledford@redhat.com> - 1.0.5-1
-+- Ininital version for rhel6
-+- Related: bz700285
-+
Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top: 2724258e9ed52f80159968b8b63216a7ba8595a6
+Top: b7ef43780109283b77986862aa8504222eb78bce
Author: Doug Ledford <dledford@redhat.com>
Date: 2012-03-01 16:40:08 -0800
+
dist-hook: ibacm.spec
cp ibacm.spec $(distdir)
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index a926fea..ac7f06f 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -11,43 +11,80 @@ Url: http://www.openfabrics.org/
+ Source: http://www.openfabrics.org/downloads/rdmacm/%{name}-%{version}.tar.gz
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+-BuildRequires: libibverbs-devel >= 1.1-1
++BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
++Requires(post): chkconfig
++Requiers(preun): chkconfig
++ExcludeArch: s390, s390x
+
+ %description
+-ibacm assists with establishing communication over Infiniband.
++The ib_acm daemon helps reduce the load of managing path record lookups on
++large InfiniBand fabrics by providing a user space implementation of what
++is functionally similar to an ARP cache. The use of ib_acm, when properly
++configured, can reduce the SA packet load of a large IB cluster from O(n^2)
++to O(n). The ib_acm daemon is started and normally runs in the background,
++user applications need not know about this daemon as long as their app
++uses librdmacm to handle connection bring up/tear down. The librdmacm
++library knows how to talk directly to the ib_acm daemon to retrieve data.
+
+-%package svc
+-Summary: IB CM pre-connection service application
+-Group: System Environment/Libraries
+-Requires: %{name} = %{version}-%{release} %{_includedir}/infiniband/verbs.h
++%package devel
++Summary: Headers file needed when building apps to talk directly to ibacm.
++Requires: %{name} = %{version}-%{release}
+
+-%description svc
+-Application daemon for IB CM pre-connection services.
++%description devel
++Most applications do not need to know how to talk directly to the ib_acm
++daemon, but it does have a socket that it listens on, and it has a
++specific protocol for incoming/outgoing data. So if you wish to build
++the ability to communicate directly with ib_acm into your own application,
++the protocol used to communicate with it, and the data structures
++involved, are in this header file. Please note that this is an unsupported
++method of using this daemon. The only supported means of using this is
++via librdmacm. As such, even though this header file is provided, no
++further documentation is available. One must read the source if they
++wish to make use of this header file.
+
+ %prep
+ %setup -q -n %{name}-%{ver}
+
+ %build
+-%configure
++aclocal -I config && libtoolize --force --copy && autoheader && \
++ automake --foreign --add-missing --copy && autoconf
++%configure --sysconfdir=/etc/rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
+ make %{?_smp_mflags}
+
+ %install
+ rm -rf $RPM_BUILD_ROOT
++make DESTDIR=%{buildroot} install
++install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ibacm
+ %makeinstall
+
+ %clean
+ rm -rf $RPM_BUILD_ROOT
+
+-%post -p /sbin/ldconfig
+-%postun -p /sbin/ldconfig
++%post
++if [ $1 = 1 ]; then
++ chkconfig --add ibacm
++fi
++%preun
++if [ $1 = 1 ]; then
++ chkconfig --del ibacm
++fi
+
+ %files
+ %defattr(-,root,root,-)
+ %doc AUTHORS COPYING README
+ %{_bindir}/ib_acme
+-%{_sbindir}/ib_acm
++%{_sbindir}/ibacm
+ %{_mandir}/man1/*
+ %{_mandir}/man7/*
++%config(noreplace) %{_sysconfdir}/rdma/*
++%{_initrddir}/ibacm
++
++%files devel
++%defattr(-,root,root,-)
+ %{_includedir}/infiniband/acm.h
+
+ %changelog
++* Tue Feb 28 2012 Doug Ledford <dledford@redhat.com> - 1.0.5-1
++- Ininital version for rhel6
++- Related: bz700285
++
diff --git a/man/ib_acme.1 b/man/ib_acme.1
index 9e44822..a00e64e 100644
--- a/man/ib_acme.1