pop

diff --git a/meta b/meta
index 3225cb14fe986ca49473b5d8784fb67db7eee201..8e42ca7fa8ce839b7b157231190b509a9243a68f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 67e7de024b3e4ee44b3a3d675fe69ff67ec2821c
-Head: ab28fe8b8753f7038560436141018a53f8aefc66
+Previous: a6510519fcc1b6ccd750983868e36ee8680d7f9d
+Head: a9e895793297dfe0e9da28739a68cc5e3391f4bd
 Applied:
   verbs-ext: ab28fe8b8753f7038560436141018a53f8aefc66
+  xrcd2: baac0085e807323f038d9c2225b6f519bc3fea1a
+  srq_ex: 3d6e3e35b5f89c7c33f02130cc4244bdbeb4f215
+  xrc_qp: 56ed588de01a8eb2e9a912d5abdb2540ce05a947
+  open_qp: 90e26c1e6a3a3c687c5404bd37ace069dd9227e5
+  open_qp_man: 629a135a7d9a161fdc3fc5327acf60ab87adf611
+  xrc_sample: a9e895793297dfe0e9da28739a68cc5e3391f4bd
 Unapplied:
-  xrcd2: 46318924283ba96f16863a0c77ad677e8d43e907
-  srq_ex: 959402295181378f53384eb318dd3f73f107e2ec
-  xrc_qp: 14ea92a7e8682895d304ee36713d2dc5d29ef3e8
-  open_qp: cd573b748ea037b19b9f1aa93bcd8062e26cda12
-  open_qp_man: 1bb5f5fdd591d818af12c9b114b8eaf913d6ebf8
-  xrc_sample: e6485431d372ecddd51edfb71d4ec03dee0a5a4b
 Hidden:

diff --git a/patches/xrcd2 b/patches/xrcd2
index 5dbb2c3958416c43711fa500c1cda15d0b701eca..87acd69710bf798238d087492bb4e453c68a34c2 100644 (file)
--- a/patches/xrcd2
+++ b/patches/xrcd2
@@ -1,4 +1,4 @@
-Bottom: 815e29364f4b5792b68b75427a1c7c571ed0a27f
+Bottom: 7a4a2fce80a8078f9b400686285ecdfc3c509c74
 Top:    2db36b8f446df11adc6bd2c4e1c444949a6db8d6
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-28 12:12:45 -0700
@@ -109,7 +109,7 @@ index 619ea7e..d7c673f 100644
  
  struct ibv_destroy_cq_v1 {
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index b196b83..cf8299a 100644
+index e4361aa..cf8299a 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -1,6 +1,6 @@
@@ -168,19 +168,7 @@ index b196b83..cf8299a 100644
        uint64_t has_comp_mask;
        size_t   sz;    /* Must be immediately before struct ibv_context */
        struct ibv_context context;/* Must be last field in the struct */
-@@ -745,6 +766,11 @@ static inline struct verbs_context *verbs_get_ctx(
-               NULL : container_of(ctx, struct verbs_context, context);
- }
- 
-+#define verbs_get_ctx_op(ctx, op) ({ \
-+      struct verbs_context *vctx = verbs_get_ctx(ctx); \
-+      (!vctx || (vctx->sz < sizeof(*vctx) - offsetof(struct verbs_context, op)) || \
-+       !vctx->op) ? NULL : vctx; })
-+
- static inline struct verbs_device *verbs_get_device(
-                                       const struct ibv_device *dev)
- {
-@@ -830,7 +856,7 @@ static inline int ___ibv_query_port(struct ibv_context *context,
+@@ -835,7 +856,7 @@ static inline int ___ibv_query_port(struct ibv_context *context,
                                    uint8_t port_num,
                                    struct ibv_port_attr *port_attr)
  {
@@ -189,7 +177,7 @@ index b196b83..cf8299a 100644
        port_attr->link_layer = IBV_LINK_LAYER_UNSPECIFIED;
        port_attr->reserved   = 0;
  
-@@ -863,6 +889,29 @@ struct ibv_pd *ibv_alloc_pd(struct ibv_context *context);
+@@ -868,6 +889,29 @@ struct ibv_pd *ibv_alloc_pd(struct ibv_context *context);
  int ibv_dealloc_pd(struct ibv_pd *pd);
  
  /**