pop

diff --git a/meta b/meta
index db1fa587bfa14f9722feea0760181ba5b2f9e15f..1330842ba8cee8a34b43c5999f1d987749714856 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,9 @@
 Version: 1
-Previous: ad938ad48d185d7e5c56630c4b9e5d90c5e1eb12
-Head: d1da4ebbf3e91aa0f7f1fe33e04d8a7aa0bd51ad
+Previous: 1c63cff2a1ba2889fc665c7e48a8d338fcd2a395
+Head: 78a740add05d65fd2bb714055e9583edd63d40cb
 Applied:
+  ibv_wc: 78a740add05d65fd2bb714055e9583edd63d40cb
 Unapplied:
-  ibv_wc: 8775933407e62bd2d2d46ad45bfb9ca61734052f
   ibv_errno: 8eab091d4012ac35cbd4c240fab5f511531ee52e
   rm-build: ecb1d23ab7af4d244d1cf424b3274f71c6bec70a
   debug-wv: f98e9be2365ed35d30abdf31128c331322849c93

diff --git a/patches/ibv_wc b/patches/ibv_wc
index ea3349a903e052198a7d6770b251a9b9e7c32177..21b5370639d3d8933aaa1fe667de4ddb44e6f8c4 100644 (file)
--- a/patches/ibv_wc
+++ b/patches/ibv_wc
@@ -1,5 +1,5 @@
-Bottom: d273b1668e5253e1352a26527b1ef7e69d3c8451
-Top:    478e828ec0d0e831c95f0ebd89d160c713015428
+Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
+Top:    06cdce656914daffeb60188020c0cbccef3f6806
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-12 10:16:26 -0700
 
@@ -18,29 +18,4 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/trunk/ulp/libibverbs/include/infiniband/verbs.h b/trunk/ulp/libibverbs/include/infiniband/verbs.h
-index 2fd0a0c..82cebde 100644
---- a/trunk/ulp/libibverbs/include/infiniband/verbs.h
-+++ b/trunk/ulp/libibverbs/include/infiniband/verbs.h
-@@ -244,14 +244,14 @@ enum ibv_wc_status
-       IBV_WC_BAD_RESP_ERR                     = WvWcBadResponse,\r
-       IBV_WC_LOC_ACCESS_ERR           = WvWcLocalAccessError,\r
-       IBV_WC_GENERAL_ERR                      = WvWcError,\r
--      IBV_WC_FATAL_ERR                        = WvWcError,\r
--      IBV_WC_RETRY_EXC_ERR            = WvWcError,\r
--      IBV_WC_REM_ABORT_ERR            = WvWcError,\r
--      IBV_WC_LOC_EEC_OP_ERR           = WvWcError,\r
--      IBV_WC_LOC_RDD_VIOL_ERR         = WvWcError,\r
--      IBV_WC_REM_INV_RD_REQ_ERR       = WvWcError,\r
--      IBV_WC_INV_EECN_ERR                     = WvWcError,\r
--      IBV_WC_INV_EEC_STATE_ERR        = WvWcError\r
-+      IBV_WC_FATAL_ERR                        = -1,\r
-+      IBV_WC_RETRY_EXC_ERR            = -2,\r
-+      IBV_WC_REM_ABORT_ERR            = -3,\r
-+      IBV_WC_LOC_EEC_OP_ERR           = -4,\r
-+      IBV_WC_LOC_RDD_VIOL_ERR         = -5,\r
-+      IBV_WC_REM_INV_RD_REQ_ERR       = -6,\r
-+      IBV_WC_INV_EECN_ERR                     = -7,\r
-+      IBV_WC_INV_EEC_STATE_ERR        = -8\r
- \r
- };
+