refresh

diff --git a/meta b/meta
index ee1ac5cae6a34ecdbd40ae230c86827a2711731a..32d9acf932129c234c36dc169375d7031145f534 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: edc4db9d68585e0cb4dc66aff4ef5a06e004e7cb
-Head: 4267e3692ddda2b22cfd7713c01d4759818dc783
+Previous: 2b33359114cf69cebeb0297e3ec18bc08aabba96
+Head: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 045b8745bb159da2fdeee216007c10f1a058d547
-  fixup-man: 36d9228ec7d95954d1c52ef9fce6f32d56a0412b
-  refresh-temp: 4267e3692ddda2b22cfd7713c01d4759818dc783
+  fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/fixup-man b/patches/fixup-man
index 3268f436ddbd01414ca3847bd6fc055674c5e901..a9c1a15cd065e688da958acb4ab8382b69b904ce 100644 (file)
--- a/patches/fixup-man
+++ b/patches/fixup-man
@@ -1,5 +1,5 @@
 Bottom: 2724258e9ed52f80159968b8b63216a7ba8595a6
-Top:    2724258e9ed52f80159968b8b63216a7ba8595a6
+Top:    dbd12c9e450afa12621e35dbb8cd04c4f28365ad
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-01 16:54:16 -0800
 
@@ -10,4 +10,25 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/man/ibacm.7 b/man/ibacm.7
+index 22c28a3..c0c63fc 100644
+--- a/man/ibacm.7
++++ b/man/ibacm.7
+@@ -17,9 +17,8 @@ similar to rdma_getaddrinfo, rdma_resolve_addr, and rdma_resolve_route using
+ IB multicast.\r
+ The IB ACM does not require IPoIB or use standard naming services, such as\r
+ DNS, and limits network communication, especially with the IB SA.\r
+-Because it uses multicast traffic and limits SA interaction, it may\r
+-not support all cluster configurations.  The ib_acme utility assists in\r
+-verifying what options of the ibacm service may be usable.\r
++The ib_acme utility assists in verifying what options of the ibacm service\r
++may be usable for the current fabric topology.\r
+ .P\r
+ Client interactions with the ibacm service are done over sockets through\r
+ a standard TCP connection.  The librdmacm abstracts this interaction.\r
+@@ -29,5 +28,4 @@ success
+ .IP "!= 0"\r
+ error\r
+ .SH "SEE ALSO"\r
+-ib_acm_resolve_name(3), ib_acm_resolve_ip(3), ib_acm_resolve_path(3)\r
+ ib_acme(1), ibacm(1)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d254943..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 2724258e9ed52f80159968b8b63216a7ba8595a6
-Top:    dbd12c9e450afa12621e35dbb8cd04c4f28365ad
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-01 16:57:08 -0800
-
-Refresh of fixup-man
-
----
-
-diff --git a/man/ibacm.7 b/man/ibacm.7
-index 22c28a3..c0c63fc 100644
---- a/man/ibacm.7
-+++ b/man/ibacm.7
-@@ -17,9 +17,8 @@ similar to rdma_getaddrinfo, rdma_resolve_addr, and rdma_resolve_route using
- IB multicast.\r
- The IB ACM does not require IPoIB or use standard naming services, such as\r
- DNS, and limits network communication, especially with the IB SA.\r
--Because it uses multicast traffic and limits SA interaction, it may\r
--not support all cluster configurations.  The ib_acme utility assists in\r
--verifying what options of the ibacm service may be usable.\r
-+The ib_acme utility assists in verifying what options of the ibacm service\r
-+may be usable for the current fabric topology.\r
- .P\r
- Client interactions with the ibacm service are done over sockets through\r
- a standard TCP connection.  The librdmacm abstracts this interaction.\r
-@@ -29,5 +28,4 @@ success
- .IP "!= 0"\r
- error\r
- .SH "SEE ALSO"\r
--ib_acm_resolve_name(3), ib_acm_resolve_ip(3), ib_acm_resolve_path(3)\r
- ib_acme(1), ibacm(1)