pop

diff --git a/meta b/meta
index c407385bc49a3d4cd0bb38ce9d22c22cd6e02bd9..92caaa5cca6e923fac7b2da58def1f72c0d772a0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: c9e065ebdc3fb4b7a95617c0e7627191e6b06619
-Head: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
+Previous: 5af8556f4e63775bcfc13030432080e0c9318300
+Head: 2d2f300c10b7039ee7c6a86341322988cca54883
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -8,8 +8,8 @@ Applied:
   acm-sock: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
   acm-init: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
   pre-socket: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
+  rs-qpsize: 2d2f300c10b7039ee7c6a86341322988cca54883
 Unapplied:
-  rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
   rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
   rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658

diff --git a/patches/rs-qpsize b/patches/rs-qpsize
index ce9a53485f3820560f34a0e64416ff5262c8597e..66457889c3567590fce431e2c14d4eab48817736 100644 (file)
--- a/patches/rs-qpsize
+++ b/patches/rs-qpsize
@@ -1,5 +1,5 @@
-Bottom: dbe6733eee8ec766ba73d02b7ae6f014b50b846a
-Top:    918eb94303796cba3dd40c4a754a411eb19992a9
+Bottom: ffc4f684b77f0da6b71d94dd50cbfd77140892ec
+Top:    54969dd5cadb4809451a5469fc6fd15e6bf7e1ff
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 17:07:11 -0700
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/cma.c b/src/cma.c
-index 9cd34cf..753612c 100755
+index 2121d06..f688c4c 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -76,6 +76,7 @@ struct cma_device {
@@ -35,7 +35,7 @@ index 9cd34cf..753612c 100755
                cma_dev->max_initiator_depth = (uint8_t) attr.max_qp_init_rd_atom;
                cma_dev->max_responder_resources = (uint8_t) attr.max_qp_rd_atom;
                ib += (cma_dev->verbs->device->transport_type == IBV_TRANSPORT_IB);
-@@ -2217,3 +2219,11 @@ void rdma_destroy_ep(struct rdma_cm_id *id)
+@@ -2215,3 +2217,11 @@ void rdma_destroy_ep(struct rdma_cm_id *id)
  
        rdma_destroy_id(id);
  }
@@ -48,7 +48,7 @@ index 9cd34cf..753612c 100755
 +      return id_priv->cma_dev->max_qpsize;
 +}
 diff --git a/src/cma.h b/src/cma.h
-index 7703fe8..f28eaf3 100644
+index 0d94e8b..ffbcbf2 100644
 --- a/src/cma.h
 +++ b/src/cma.h
 @@ -67,7 +67,7 @@ static inline uint64_t htonll(uint64_t x) { return x; }