From 2d25f2c7da1c6ee10a855f136c6222896dc9340f Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 28 Sep 2012 09:35:09 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 22 ---------------------- patches/xrc_qp | 6 +++--- 3 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 81cbd67..80b3af4 100644 --- a/meta +++ b/meta @@ -1,12 +1,11 @@ Version: 1 -Previous: 7de31b4f227bafd8b3fb963b320414e0dddf5091 -Head: d041b6c156cadd4b09c3bd98a0a4ec1a0c23d565 +Previous: 7182068c75411a43f027e2ecc925e2fe6e26ec0e +Head: fd2b241fc556d6178ad0bd9d0277eccb11614869 Applied: verbs-ext: 6f5bd9320736c14a35405d30b5bcda552c0a9bc3 xrcd: b4857ddf1a0837fff54f81be34a1464e9239de0e srq_ex: d347d0a929958e09fceecc8a5c403d1c782354b7 - xrc_qp: dcbdc3f4676bc97c50c6629662a0f7d540d05e1c - refresh-temp: d041b6c156cadd4b09c3bd98a0a4ec1a0c23d565 + xrc_qp: fd2b241fc556d6178ad0bd9d0277eccb11614869 Unapplied: open_qp: 6879b6122f8020f5defafa829507258bde55d00d open_qp_man: fceeb733e907e3f0a5ccd10277e9b8807c4c9bb8 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index e347a3d..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,22 +0,0 @@ -Bottom: 6ad25dcd1ebd92d2c9c36b7a806562fab4a89dc7 -Top: 92189646fa5375636a144f345ec3a98cb7333384 -Author: Sean Hefty -Date: 2012-09-28 09:35:09 -0700 - -Refresh of xrc_qp - ---- - -diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h -index e5fe588..397eb85 100644 ---- a/include/infiniband/verbs.h -+++ b/include/infiniband/verbs.h -@@ -481,7 +481,7 @@ struct ibv_qp_init_attr_ex { - enum ibv_qp_type qp_type; - int sq_sig_all; - -- uint64_t comp_mask; -+ uint32_t comp_mask; - struct ibv_pd *pd; - struct ibv_xrcd *xrcd; - }; diff --git a/patches/xrc_qp b/patches/xrc_qp index 06bc288..cedbd0a 100644 --- a/patches/xrc_qp +++ b/patches/xrc_qp @@ -1,5 +1,5 @@ Bottom: 2524e29d2e369a9ff026f617bd9b1d60640fa84f -Top: 6ad25dcd1ebd92d2c9c36b7a806562fab4a89dc7 +Top: 92189646fa5375636a144f345ec3a98cb7333384 Author: Sean Hefty Date: 2012-09-17 16:00:12 -0700 @@ -80,7 +80,7 @@ index 3d72fa7..b6d5ce9 100644 }; diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h -index 47ec63c..e5fe588 100644 +index 47ec63c..397eb85 100644 --- a/include/infiniband/verbs.h +++ b/include/infiniband/verbs.h @@ -107,7 +107,8 @@ enum ibv_device_cap_flags { @@ -123,7 +123,7 @@ index 47ec63c..e5fe588 100644 + enum ibv_qp_type qp_type; + int sq_sig_all; + -+ uint64_t comp_mask; ++ uint32_t comp_mask; + struct ibv_pd *pd; + struct ibv_xrcd *xrcd; +}; -- 2.46.0