pop

diff --git a/meta b/meta
index d3fc32aa86460d1cbe296c28a709d969387fa79f..03d219ce2db8ff39854c35c8be811708e8f381df 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,12 @@
 Version: 1
-Previous: 5d0368ce3c4ec2f127f9cdeb61daf7366717056c
-Head: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
+Previous: e1ea33fb13f3306e4c91601cc1f3021f1f51b437
+Head: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
   acm-sock: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
+  acm-init: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
 Unapplied:
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
@@ -14,7 +15,6 @@ Unapplied:
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  acm-init: 666fa02d8f18ac2e98008cd3d57a90a864203548
   pre-socket: 659f605c2d6bdba067651138aa5ffc01f14465d6
   rs-states: 94e4650160dd8b32efd7e1befe3b179487bd7cac
   rstream-opt: dd89287ce678fa211e3f427497f42e447c48b56d

diff --git a/patches/acm-init b/patches/acm-init
index f5cd118f79347f1c6dfe50bd103bbe5f444b39fe..d7578a97209d5de8e2531738e00eed8397098415 100644 (file)
--- a/patches/acm-init
+++ b/patches/acm-init
@@ -1,5 +1,5 @@
-Bottom: f9da4f0a214d84797e29c62aa0628a78b3d890bd
-Top:    ed5b3cf23ac01acbc57d249c7083577a19d344ce
+Bottom: 42520035c31e4c7b40e6afd14253aa2eba614e30
+Top:    7d082b248d215ee4c87c6a5c68d9aef9dbc46174
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 10:48:47 -0700
 
@@ -59,10 +59,10 @@ index 9c65919..5bdeb88 100755
  
  void ucma_ib_cleanup(void)
 diff --git a/src/cma.c b/src/cma.c
-index 753612c..f688c4c 100755
+index 9cd34cf..2121d06 100755
 --- a/src/cma.c
 +++ b/src/cma.c
-@@ -274,8 +274,6 @@ int ucma_init(void)
+@@ -272,8 +272,6 @@ int ucma_init(void)
                ib += (cma_dev->verbs->device->transport_type == IBV_TRANSPORT_IB);
        }
  
@@ -72,10 +72,10 @@ index 753612c..f688c4c 100755
        ucma_set_af_ib_support();
        pthread_mutex_unlock(&mut);
 diff --git a/src/cma.h b/src/cma.h
-index 2f5215c..2ee4767 100644
+index 7703fe8..0d94e8b 100644
 --- a/src/cma.h
 +++ b/src/cma.h
-@@ -119,11 +119,9 @@ extern int af_ib_support;
+@@ -117,11 +117,9 @@ extern int af_ib_support;
  #define RAI_ROUTEONLY         0x01000000
  
  #ifdef USE_IB_ACM