refresh

diff --git a/meta b/meta
index 31a236e0d6894c63a8914062174262cdb2fce969..24757e749921d05a84c49f4cb8c4646a5cda0b2b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 0488599eddbd427555476c3a8dbc320911d60ec1
-Head: 46ef297529ec213889dc1b33e41dd4f502533f9f
+Previous: 41c955ace11be88646f9ccb9747e7ffdd94b50d1
+Head: dd3a3bca63c456936ac554e837c68cf4ae20b70e
 Applied:
   verbs-ext: 6fbf2b29ca68fc10b7ee47dc0c09f54db0b32320
-  compat-ex: b38e2cdc51cd6ff96ec20e9207cf3c4d87197c23
-  refresh-temp: 46ef297529ec213889dc1b33e41dd4f502533f9f
+  compat-ex: dd3a3bca63c456936ac554e837c68cf4ae20b70e
 Unapplied:
   xrcd: 0e21cac2fc216f26a141a34cfb9e6ce5adfcd9f0
 Hidden:

diff --git a/patches/compat-ex b/patches/compat-ex
index 67647d1070e9704cc1e9e44d61fd1d8046f8738d..d7f119f8044c554aa1e901600bc66f00d92bcfcd 100644 (file)
--- a/patches/compat-ex
+++ b/patches/compat-ex
@@ -1,5 +1,5 @@
 Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    b2b2b839d978bb240b0641dff8459eaee9553d17
+Top:    4b674baff0d96dfedd5f8d280c3b3a30460c5324
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-12 11:32:27 -0700
 
@@ -16,4 +16,127 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
+index a2577d8..40bb4e6 100644
+--- a/include/infiniband/verbs.h
++++ b/include/infiniband/verbs.h
+@@ -307,9 +307,14 @@ enum ibv_access_flags {
+       IBV_ACCESS_MW_BIND              = (1<<4)
+ };
+ 
++enum ibv_pd_mask {
++      IBV_PD_RESERVED                 = 1 << 0
++};
++
+ struct ibv_pd {
+       struct ibv_context     *context;
+       uint32_t                handle;
++      uint32_t                comp_mask;
+ };
+ 
+ enum ibv_rereg_mr_flags {
+@@ -319,6 +324,10 @@ enum ibv_rereg_mr_flags {
+       IBV_REREG_MR_KEEP_VALID         = (1 << 3)
+ };
+ 
++enum ibv_mr_mask {
++      IBV_MR_RESERVED                 = 1 << 0
++};
++
+ struct ibv_mr {
+       struct ibv_context     *context;
+       struct ibv_pd          *pd;
+@@ -327,6 +336,7 @@ struct ibv_mr {
+       uint32_t                handle;
+       uint32_t                lkey;
+       uint32_t                rkey;
++      uint32_t                comp_mask;
+ };
+ 
+ enum ibv_mw_type {
+@@ -334,10 +344,15 @@ enum ibv_mw_type {
+       IBV_MW_TYPE_2                   = 2
+ };
+ 
++enum ibv_mw_mask {
++      IBV_MW_RESERVED                 = 1 << 0
++};
++
+ struct ibv_mw {
+       struct ibv_context     *context;
+       struct ibv_pd          *pd;
+       uint32_t                rkey;
++      uint32_t                comp_mask;
+ };
+ 
+ struct ibv_global_route {
+@@ -568,6 +583,10 @@ struct ibv_mw_bind {
+       int                     mw_access_flags;
+ };
+ 
++enum ibv_srq_mask {
++      IBV_SRQ_RESERVED                = 1 << 0
++};
++
+ struct ibv_srq {
+       struct ibv_context     *context;
+       void                   *srq_context;
+@@ -577,6 +596,12 @@ struct ibv_srq {
+       pthread_mutex_t         mutex;
+       pthread_cond_t          cond;
+       uint32_t                events_completed;
++
++      uint32_t                comp_mask;
++};
++
++enum ibv_qp_mask {
++      IBV_QP_RESERVED                 = 1 << 0
+ };
+ 
+ struct ibv_qp {
+@@ -594,12 +619,24 @@ struct ibv_qp {
+       pthread_mutex_t         mutex;
+       pthread_cond_t          cond;
+       uint32_t                events_completed;
++
++      uint32_t                comp_mask;
++};
++
++enum ibv_comp_channel_mask {
++      IBV_COMP_CHANNEL_RESERVED       = 1 << 0
+ };
+ 
+ struct ibv_comp_channel {
+       struct ibv_context     *context;
+       int                     fd;
+       int                     refcnt;
++
++      uint32_t                comp_mask;
++};
++
++enum ibv_cq_mask {
++      IBV_CQ_RESERVED                 = 1 << 0
+ };
+ 
+ struct ibv_cq {
+@@ -613,12 +650,20 @@ struct ibv_cq {
+       pthread_cond_t          cond;
+       uint32_t                comp_events_completed;
+       uint32_t                async_events_completed;
++
++      uint32_t                comp_mask;
++};
++
++enum ibv_ah_mask {
++      IBV_AH_RESERVED                 = 1 << 0
+ };
+ 
+ struct ibv_ah {
+       struct ibv_context     *context;
+       struct ibv_pd          *pd;
+       uint32_t                handle;
++
++      uint32_t                comp_mask;
+ };
+ 
+ struct ibv_device;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9e2cb0f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,133 +0,0 @@
-Bottom: b2b2b839d978bb240b0641dff8459eaee9553d17
-Top:    4b674baff0d96dfedd5f8d280c3b3a30460c5324
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-12 11:40:52 -0700
-
-Refresh of compat-ex
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a2577d8..40bb4e6 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -307,9 +307,14 @@ enum ibv_access_flags {
-       IBV_ACCESS_MW_BIND              = (1<<4)
- };
- 
-+enum ibv_pd_mask {
-+      IBV_PD_RESERVED                 = 1 << 0
-+};
-+
- struct ibv_pd {
-       struct ibv_context     *context;
-       uint32_t                handle;
-+      uint32_t                comp_mask;
- };
- 
- enum ibv_rereg_mr_flags {
-@@ -319,6 +324,10 @@ enum ibv_rereg_mr_flags {
-       IBV_REREG_MR_KEEP_VALID         = (1 << 3)
- };
- 
-+enum ibv_mr_mask {
-+      IBV_MR_RESERVED                 = 1 << 0
-+};
-+
- struct ibv_mr {
-       struct ibv_context     *context;
-       struct ibv_pd          *pd;
-@@ -327,6 +336,7 @@ struct ibv_mr {
-       uint32_t                handle;
-       uint32_t                lkey;
-       uint32_t                rkey;
-+      uint32_t                comp_mask;
- };
- 
- enum ibv_mw_type {
-@@ -334,10 +344,15 @@ enum ibv_mw_type {
-       IBV_MW_TYPE_2                   = 2
- };
- 
-+enum ibv_mw_mask {
-+      IBV_MW_RESERVED                 = 1 << 0
-+};
-+
- struct ibv_mw {
-       struct ibv_context     *context;
-       struct ibv_pd          *pd;
-       uint32_t                rkey;
-+      uint32_t                comp_mask;
- };
- 
- struct ibv_global_route {
-@@ -568,6 +583,10 @@ struct ibv_mw_bind {
-       int                     mw_access_flags;
- };
- 
-+enum ibv_srq_mask {
-+      IBV_SRQ_RESERVED                = 1 << 0
-+};
-+
- struct ibv_srq {
-       struct ibv_context     *context;
-       void                   *srq_context;
-@@ -577,6 +596,12 @@ struct ibv_srq {
-       pthread_mutex_t         mutex;
-       pthread_cond_t          cond;
-       uint32_t                events_completed;
-+
-+      uint32_t                comp_mask;
-+};
-+
-+enum ibv_qp_mask {
-+      IBV_QP_RESERVED                 = 1 << 0
- };
- 
- struct ibv_qp {
-@@ -594,12 +619,24 @@ struct ibv_qp {
-       pthread_mutex_t         mutex;
-       pthread_cond_t          cond;
-       uint32_t                events_completed;
-+
-+      uint32_t                comp_mask;
-+};
-+
-+enum ibv_comp_channel_mask {
-+      IBV_COMP_CHANNEL_RESERVED       = 1 << 0
- };
- 
- struct ibv_comp_channel {
-       struct ibv_context     *context;
-       int                     fd;
-       int                     refcnt;
-+
-+      uint32_t                comp_mask;
-+};
-+
-+enum ibv_cq_mask {
-+      IBV_CQ_RESERVED                 = 1 << 0
- };
- 
- struct ibv_cq {
-@@ -613,12 +650,20 @@ struct ibv_cq {
-       pthread_cond_t          cond;
-       uint32_t                comp_events_completed;
-       uint32_t                async_events_completed;
-+
-+      uint32_t                comp_mask;
-+};
-+
-+enum ibv_ah_mask {
-+      IBV_AH_RESERVED                 = 1 << 0
- };
- 
- struct ibv_ah {
-       struct ibv_context     *context;
-       struct ibv_pd          *pd;
-       uint32_t                handle;
-+
-+      uint32_t                comp_mask;
- };
- 
- struct ibv_device;