pop

diff --git a/meta b/meta
index e68e783c894bc12de8cfecc56a7cbce988f4e2f0..8c9e30c2487f67849e12c260edaedc8b43f06a82 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: 444fd13d40f1b1104dd88f7090cf7c493b2e8fe3
-Head: bb7f3142f8017b6a52e6df43bde5e3cac3a1abca
+Previous: 6ed90f503736c963b879d6bcae282463aff0e02a
+Head: 98fad3821fdb1bdd5455d04d9f079fe891567fe9
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: a13fd8c5744c3f8eb80150654e2c34e50a5f04aa
   transpose: a7c033f7a783bc59ce12e9f6b2d64551b89638b8
   fork: 6a107ab9f258e6cb379337a744b67961f7d84cff
   rstream-fork: bb7f3142f8017b6a52e6df43bde5e3cac3a1abca
+  dbg: 98fad3821fdb1bdd5455d04d9f079fe891567fe9
 Unapplied:
-  dbg: 5a73c8122f47924e7bcf912dbf8ba2e6fbc48f64
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/dbg b/patches/dbg
index 1253f1f9786d7b7e08560d7be0ef76f253ba315e..b54d03e472b5fed71aed5dfb28a9dc4904fe579f 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
-Bottom: 1f4485c0b98410aa12e6f2832d81210b64ac5c0f
-Top:    37d061895c83f91d3f517da6ad238319d308ee80
+Bottom: d8f9277a23df3bd370254e83e9b085ac6d5b3522
+Top:    aededacb19a5e40c9a4c34babce2d25d3ade4276
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-18 09:01:43 -0700
 
@@ -21,7 +21,7 @@ index 8595657..a699e0a 100644
                return 100;
        else if (size >= 100000)
 diff --git a/src/cma.c b/src/cma.c
-index 86dd787..9e3a891 100755
+index e2772fa..9a4508a 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -48,6 +48,7 @@
@@ -32,7 +32,7 @@ index 86dd787..9e3a891 100755
  
  #include "cma.h"
  #include <infiniband/driver.h>
-@@ -139,6 +140,7 @@ static void ucma_cleanup(void)
+@@ -142,6 +143,7 @@ static void ucma_cleanup(void)
                free(cma_dev_array);
                cma_dev_cnt = 0;
        }
@@ -40,7 +40,7 @@ index 86dd787..9e3a891 100755
  }
  
  static int check_abi_version(void)
-@@ -212,6 +214,7 @@ int ucma_init(void)
+@@ -215,6 +217,7 @@ int ucma_init(void)
        if (cma_dev_cnt)
                return 0;