pop

diff --git a/meta b/meta
index cff2b2838778f718f0b7ccbab8755b73116d4520..4b35417d13f4afe7b32bb82db076bf92fb1d064d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,14 @@
 Version: 1
-Previous: c1dcbb1c874764e3698cc42eadce63a83fc0763b
-Head: 2ffda7f2991395570b9e776ff5ae256ca9684771
+Previous: 2a2b184d1167185fecbf5a1bfe6b199668bdd477
+Head: 0068d0c2bc8c327b322182bdb33e140beeb9b706
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
+  transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
+  fork: 1768d762d8a2100e5250234ddf080b722a5e582f
+  rstream-fork: 602815d0414b4eeb27251c22383cd13b75796480
+  dbg: 0068d0c2bc8c327b322182bdb33e140beeb9b706
 Unapplied:
-  transpose: c6f28dc048728ed30f1b57b6dcfd114ab62e5dde
-  fork: 7e54bf6ca1d3f328bfcf9b4c0153c8f3f9fa3afa
-  rstream-fork: 8a1f5d82247f515f4210213214f64b93bc087d30
-  dbg: 288090d29ae6d8e9f0a4095e0ede35fcf01073ae
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
 Hidden:

diff --git a/patches/dbg b/patches/dbg
index ba9c1d13b85d3965e9c3bf0bcb1bcede747e7101..6b77ddc9701457fb1581dcd50ffaa95aa7e04023 100644 (file)
--- a/patches/dbg
+++ b/patches/dbg
@@ -1,5 +1,5 @@
-Bottom: d4337025c44cc87a2920926b41cda9157e72672f
-Top:    745e8e2433831ce376d98dc3e50d6fb82aae2d20
+Bottom: fac77e11574baf1034f2881bef2086f2f30ac95a
+Top:    7b0876f9f10ef25f4263299f13c467795f023180
 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 65b52bf..17ea75d 100755
+index 5280620..54b804e 100755
 --- a/src/cma.c
 +++ b/src/cma.c
 @@ -48,6 +48,7 @@
@@ -32,7 +32,7 @@ index 65b52bf..17ea75d 100755
  
  #include "cma.h"
  #include <infiniband/driver.h>
-@@ -142,6 +143,7 @@ static void ucma_cleanup(void)
+@@ -141,6 +142,7 @@ static void ucma_cleanup(void)
                free(cma_dev_array);
                cma_dev_cnt = 0;
        }
@@ -40,7 +40,7 @@ index 65b52bf..17ea75d 100755
  }
  
  static int check_abi_version(void)
-@@ -215,6 +217,7 @@ int ucma_init(void)
+@@ -214,6 +216,7 @@ int ucma_init(void)
        if (cma_dev_cnt)
                return 0;
  

diff --git a/patches/fork b/patches/fork
index a731d4bd3835aa731524d52a1e5f76c7da43793a..05dedd26e12b0f6e4d97a37f955b53fb82197f9d 100644 (file)
--- a/patches/fork
+++ b/patches/fork
@@ -1,5 +1,5 @@
-Bottom: e5093e7ce4e37c0d25de83ffaff51f99c74bef79
-Top:    80e2c3a5b731d7f472b8b4412e41dac6f0c4a9b3
+Bottom: 47adffa1c470a8413209e0679e601e328605b9da
+Top:    06618864b863228d0a358680b7f0aeafe4237c7b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-13 15:25:53 -0700
 

diff --git a/patches/rstream-fork b/patches/rstream-fork
index ff90f25a0edc48b86eead79fc7c8bad37f7c9327..2dea55c304adb5e103f9892e1bea4411cf103f33 100644 (file)
--- a/patches/rstream-fork
+++ b/patches/rstream-fork
@@ -1,5 +1,5 @@
-Bottom: 80e2c3a5b731d7f472b8b4412e41dac6f0c4a9b3
-Top:    d4337025c44cc87a2920926b41cda9157e72672f
+Bottom: 06618864b863228d0a358680b7f0aeafe4237c7b
+Top:    fac77e11574baf1034f2881bef2086f2f30ac95a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-17 15:32:54 -0700
 

diff --git a/patches/transpose b/patches/transpose
index 7b0b26216db153c4060da577d7bbc04d4d399e3f..2a5c8b5963452551f0e8a4ec00e96891d87abfb4 100644 (file)
--- a/patches/transpose
+++ b/patches/transpose
@@ -1,5 +1,5 @@
-Bottom: 95b121ec32dc0d0d10c0de528bba1ae1ed0075b1
-Top:    e5093e7ce4e37c0d25de83ffaff51f99c74bef79
+Bottom: c8846aeda5a7df646fc7288b1944956da799963f
+Top:    47adffa1c470a8413209e0679e601e328605b9da
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-16 14:17:58 -0700