refresh

diff --git a/meta b/meta
index 43c8c4b1c3d0bd9667cca9b617fe4b4d3bd94d2b..c58457c15ce03fc7395d6bd4b25ba79f7cf9f4e3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 85f42cc8766f2d29c856167b78e9a9c3b000f0d4
-Head: 5f8151a72a9ba86163177f154549836af836be35
+Previous: 6ae1dad386d182499c6eef074f86da19b38dc15f
+Head: 99a9838e9b2ed605005882655df73a213130c530
 Applied:
-  af_ib: 34d689f56549a6700cba59671e1ab6c8fbb7cabe
-  refresh-temp: 5f8151a72a9ba86163177f154549836af836be35
+  af_ib: 99a9838e9b2ed605005882655df73a213130c530
 Unapplied:
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/af_ib b/patches/af_ib
index 1313504f56c7c707d9a85af3aebaf55ec8f059b7..357ce8ce31abd090987ced63ea01f5c4cea7d1f4 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
 Bottom: 15d584ee23e38f450359c3caea511818f5bf14c0
-Top:    15d584ee23e38f450359c3caea511818f5bf14c0
+Top:    123a60d6442394ee440c1abde7600937c1f536cb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-17 14:02:45 -0700
 
@@ -10,4 +10,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index 5280620..9286e81 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -185,9 +185,6 @@ static void ucma_set_af_ib_support(void)
+       struct sockaddr_ib sib;
+       int ret;
+ 
+-      /* Just return - do not enable AF_IB support for now */
+-      return;
+-
+       ret = rdma_create_id(NULL, &id, NULL, RDMA_PS_IB);
+       if (ret)
+               return;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f161777..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,23 +0,0 @@
-Bottom: 15d584ee23e38f450359c3caea511818f5bf14c0
-Top:    123a60d6442394ee440c1abde7600937c1f536cb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-17 14:03:54 -0700
-
-Refresh of af_ib
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 5280620..9286e81 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -185,9 +185,6 @@ static void ucma_set_af_ib_support(void)
-       struct sockaddr_ib sib;
-       int ret;
- 
--      /* Just return - do not enable AF_IB support for now */
--      return;
--
-       ret = rdma_create_id(NULL, &id, NULL, RDMA_PS_IB);
-       if (ret)
-               return;