refresh (create temporary patch)

diff --git a/meta b/meta
index 9fce53931260bfb8b89b977c000243e2500940e3..bbdff78346f52d01865ac1bd15648b9283d182a8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 1c00efd43467712399ec0f1352f566cc4f415d15
-Head: 79cab9b7dd9d2d4b8794079b8d0bd6a3c265eb9d
+Previous: a75251ddafe71fd42650beea469a3e3a1603bae6
+Head: ed6b49f5c34c3a8abe6c7bfda633c1fe7a284ac3
 Applied:
   0001-lazy-init.patch: 79cab9b7dd9d2d4b8794079b8d0bd6a3c265eb9d
+  refresh-temp: ed6b49f5c34c3a8abe6c7bfda633c1fe7a284ac3
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..ca10b03
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,31 @@
+Bottom: 5fe7b77f89825f3fb2f887164f7bd1fbde8d04da
+Top:    99652de79f6e570f6df54f6ac0bcb32159c9afc5
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2014-04-09 20:27:27 -0700
+
+Refresh of 0001-lazy-init.patch
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 12c8599..886d04a 100644
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -228,7 +228,7 @@ static struct ibv_context *ucma_open_device(uint64_t guid)
+               fprintf(stderr, PFX "Fatal: unable to open RDMA device\n");
+ 
+       ibv_free_device_list(dev_list);
+-      return 0;
++      return verbs;
+ }
+ 
+ static int ucma_dev_init(struct cma_device *cma_dev)
+@@ -411,7 +411,7 @@ static int ucma_get_device(struct cma_id_private *id_priv, uint64_t guid)
+ 
+       return ERR(ENODEV);
+ match:
+-      if (!ucma_dev_init(cma_dev))
++      if (ucma_dev_init(cma_dev))
+               return ERR(ENODEV);
+ 
+       pthread_mutex_lock(&mut);