refresh

diff --git a/meta b/meta
index 8dd17479cc411578fb3bb202089946d3946b5059..a34f5ddff2b5a6ad2358f1680e081ac065dff96e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: eafad2b854c96519dd48c020e80c4a08589e95d4
-Head: 17a866d0bbc70943e205d8254c0b02c0ecc7a634
+Previous: aa308d05c0c667f8196369a3cea91c39b7fcb38e
+Head: b1cc207d04e9df91c000aadd20d3612f3cb58552
 Applied:
-  verbs-ext: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3
-  refresh-temp: 17a866d0bbc70943e205d8254c0b02c0ecc7a634
+  verbs-ext: b1cc207d04e9df91c000aadd20d3612f3cb58552
 Unapplied:
   xrcd: b4857ddf1a0837fff54f81be34a1464e9239de0e
   srq_ex: 404e74c3eec99818cf38bff5f2534dc48ad56627

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 638d804..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,31 +0,0 @@
-Bottom: 8f54664c1ae0c2059bd040a5eb02d960e77020b9
-Top:    ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-09-28 10:28:17 -0700
-
-Refresh of verbs-ext
-
----
-
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index cd7f916..d944680 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
-@@ -727,12 +727,17 @@ struct ibv_context {
-       void                   *abi_compat;
- };
- 
-+enum verbs_context_mask {
-+      VERBS_CONTEXT_RESERVED = 1 << 0
-+};
-+
- struct verbs_context {
- 
-       /*  "grows up" - new fields go here
-       int (*drv_new_func1) ();        new corresponding provider call of func1
-       int (*lib_new_func1) ();        New library call func1
-       */
-+      uint64_t has_comp_mask;
-       size_t sz;      /* Set by library on struct allocation,must be
-                       * located right before struct ibv_context
-                       */

diff --git a/patches/verbs-ext b/patches/verbs-ext
index 7dd05f2063a83965829bf362fe3c5d0150ee9908..56327944b9fe2098cf068688cc8d1970bac77455 100644 (file)
--- a/patches/verbs-ext
+++ b/patches/verbs-ext
@@ -1,5 +1,5 @@
 Bottom: 3441ce7abc8e145f2eb9ef7110fe2a69010bd8f6
-Top:    8f54664c1ae0c2059bd040a5eb02d960e77020b9
+Top:    ff25a98f5caa5889dfa52d7e2a6a9aa3e69b3ee5
 Author: Yishai Hadas <yishaih@mellanox.com>
 Date:   2012-08-26 16:43:30 +0300
 
@@ -51,7 +51,7 @@ index 9a81416..f22f287 100644
                        size_t cmd_size, struct ibv_get_context_resp *resp,
                        size_t resp_size);
 diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 6acfc81..cd7f916 100644
+index 6acfc81..d944680 100644
 --- a/include/infiniband/verbs.h
 +++ b/include/infiniband/verbs.h
 @@ -38,6 +38,7 @@
@@ -100,16 +100,21 @@ index 6acfc81..cd7f916 100644
  struct ibv_context_ops {
        int                     (*query_device)(struct ibv_context *context,
                                              struct ibv_device_attr *device_attr);
-@@ -702,6 +727,32 @@ struct ibv_context {
+@@ -702,6 +727,37 @@ struct ibv_context {
        void                   *abi_compat;
  };
  
++enum verbs_context_mask {
++      VERBS_CONTEXT_RESERVED = 1 << 0
++};
++
 +struct verbs_context {
 +
 +      /*  "grows up" - new fields go here
 +      int (*drv_new_func1) ();        new corresponding provider call of func1
 +      int (*lib_new_func1) ();        New library call func1
 +      */
++      uint64_t has_comp_mask;
 +      size_t sz;      /* Set by library on struct allocation,must be
 +                      * located right before struct ibv_context
 +                      */