refresh

diff --git a/meta b/meta
index dd0b39739f6e22f6a8cc1c772964a571c8b66173..f7d961a868e50afa2055595faea78920d8c55aa0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 5fce27538275b912d138be8935be9bd269a751bc
-Head: 93d74d6f5a73fc18e42a641a55de3203607d2e25
+Previous: 20a01c62aafb91fadc285f335ef954516af149e2
+Head: ccef1e1b38f8566a4fab83e12e38e2610cc2dea7
 Applied:
-  kern-bug: 371b692ceabacccb9b7313d89c50e79e4d7b9ed6
-  refresh-temp: 93d74d6f5a73fc18e42a641a55de3203607d2e25
+  kern-bug: ccef1e1b38f8566a4fab83e12e38e2610cc2dea7
 Unapplied:
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
   addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e

diff --git a/patches/kern-bug b/patches/kern-bug
index 501722ef8928cb0f029392b811fd9f9d270336db..fe38c3c764f1f0fb5e90d68111625f7fd5ab26f3 100644 (file)
--- a/patches/kern-bug
+++ b/patches/kern-bug
@@ -1,5 +1,5 @@
 Bottom: b6004c656a03f1cecd7bb483178086496ae46a69
-Top:    cfa0e77e75c5916658adb6db2edde6e75c0adac2
+Top:    6ff4c3fef859b775522c27db8de4a8fcfcf792c3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-02-01 17:17:34 -0800
 
@@ -26,7 +26,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/cma.c b/src/cma.c
-index ff9b426..0220f1f 100755
+index ff9b426..547781e 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -50,6 +50,7 @@
@@ -55,7 +55,7 @@ index ff9b426..0220f1f 100755
 +              return;
 +
 +      pthread_mutex_lock(&mut);
-+      idm_set(&ucma_idm, id_priv->handle, rs);
++      idm_set(&ucma_idm, id_priv->handle, id_priv);
 +      pthread_mutex_unlock(&mut);
 +}
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index d87e648..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: cfa0e77e75c5916658adb6db2edde6e75c0adac2
-Top:    6ff4c3fef859b775522c27db8de4a8fcfcf792c3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-02-01 22:30:26 -0800
-
-Refresh of kern-bug
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 0220f1f..547781e 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -384,7 +384,7 @@ static void ucma_insert_id(struct cma_id_private *id_priv)
-               return;
- 
-       pthread_mutex_lock(&mut);
--      idm_set(&ucma_idm, id_priv->handle, rs);
-+      idm_set(&ucma_idm, id_priv->handle, id_priv);
-       pthread_mutex_unlock(&mut);
- }