refresh

diff --git a/meta b/meta
index 1ae01d1215e467e362bec841a52ebb9a0e45a91b..cf9614d264fdb8bb8ffa215e89daedf47e3b58d0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: ea1e23b961731632d1ac8e3f3185834a66da9ab7
-Head: 0f688feccdff844beaa9b7935bf50ad4591d84b2
+Previous: ffec4f55df6cbd2e93d37fbadf2907ca43567960
+Head: 47c8914009e8854b89d015de99eca7b102b9ea69
 Applied:
-  ib-init: b52ddf36aa04b86a26d2462400386fdd24f40c77
-  refresh-temp: 0f688feccdff844beaa9b7935bf50ad4591d84b2
+  ib-init: 47c8914009e8854b89d015de99eca7b102b9ea69
 Unapplied:
   xfer-cnt: 52a03dfbd23c1f257303d05c489041eb75ce76eb
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae

diff --git a/patches/ib-init b/patches/ib-init
index a7bad7e80696025cc12e7dd47ac362cda6b7fceb..8757546da2504b48996666f72467c830e22cf45a 100644 (file)
--- a/patches/ib-init
+++ b/patches/ib-init
@@ -5,12 +5,11 @@ Date:   2013-03-25 14:20:33 -0700
 
 Call ucma_ib_init() during startup
 
-ucma_ib_init() was removed from ucma_init() to avoid
-recursive callback issues when using the librspreload
-library over rsockets.  Although rsockets calls ucma_ib_init,
-other pieces of the code do not.  The result is that
-ibacm ends up being disabled unless rsockets has been
-used.  Fix this by calling ucma_ib_init() where needed.
+Commit 272c3cc024d0e5854cbafa6c2f1e8560398a68d7 removed
+automatic calls to ucma_ib_init().  It was added back for
+rsocket calls, but not for the older rdma_cm calls.  The
+result is that ibacm support ends up being disabled.  Fix
+this by calling ucma_ib_init() where needed.
 
 This problem was reported by Jens Domke
 <domke.j.aa@m.titech.ac.jp>

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5bfa930..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 03e0d857be2abeca4aaf50a1c372dc983b1332dc
-Top:    03e0d857be2abeca4aaf50a1c372dc983b1332dc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-03-25 17:02:48 -0700
-
-Refresh of ib-init
-
----
-
-