refresh

diff --git a/meta b/meta
index 0e833a2b43ba150392f4a3158786b40b5e0545f0..ebb5035819262313987d26f27eb1e41fdbe279d2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3a8183e87de4c2dcbe2076dbab2382041355a808
-Head: f7733ae18408b43d37bea98b5c92a4e582b8ec2a
+Previous: 0a9275fe537ab18be3983ecb5a54f797d7496a47
+Head: 9f12103789bbddb128cd089639a49f6326c5a7e4
 Applied:
-  dapl-qp: eebff940fddf2bb020bb1dc49ba68eaa3d3c7e3b
-  refresh-temp: f7733ae18408b43d37bea98b5c92a4e582b8ec2a
+  dapl-qp: 9f12103789bbddb128cd089639a49f6326c5a7e4
 Unapplied:
   sync: 452ce3b051e10e10363baa77834962a89267e052
   pre-af-ib: 73504ef1f812bea6d1fd59f194f90e5194ca2efa

diff --git a/patches/dapl-qp b/patches/dapl-qp
index f9cdcc54d337e2ac58ab17dc178bd046bdb65597..36fed8b3a404fcb401e9553c5794b143bf48c148 100644 (file)
--- a/patches/dapl-qp
+++ b/patches/dapl-qp
@@ -1,5 +1,5 @@
 Bottom: e0a336baf5ecfc37b867ad87df4aa629ac448200
-Top:    82f215e8052d95a49ebdf8c0e068d1563f33b52a
+Top:    93dc9df83581d53c19bcc51ce579506772ec1852
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-09-09 10:41:28 -0700
 
@@ -16,18 +16,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-index f52f5da..ab8488b 100644
+index f52f5da..3a693ef 100644
 --- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
 +++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-@@ -295,7 +295,6 @@ dapls_ib_qp_alloc (
-     return (DAT_SUCCESS);
- }
- 
--
- /*
-  * dapls_ib_qp_free
-  *
-@@ -325,16 +324,18 @@ dapls_ib_qp_free (
+@@ -325,16 +325,18 @@ dapls_ib_qp_free (
                        ep_ptr->qp_handle,
                        ib_get_port_state_str(ep_ptr->qp_state));
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9835511..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 82f215e8052d95a49ebdf8c0e068d1563f33b52a
-Top:    93dc9df83581d53c19bcc51ce579506772ec1852
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-09-09 13:38:31 -0700
-
-Refresh of dapl-qp
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-index ab8488b..3a693ef 100644
---- a/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-+++ b/trunk/ulp/dapl2/dapl/ibal/dapl_ibal_qp.c
-@@ -295,6 +295,7 @@ dapls_ib_qp_alloc (
-     return (DAT_SUCCESS);
- }
- 
-+
- /*
-  * dapls_ib_qp_free
-  *