pop

diff --git a/meta b/meta
index 1106f0739d015e6bd987ef75f3aa36eb9e3b6693..dc8ff4f56f37dac9b706da269a56685ad683c38e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 2035d79f258965254daccfd1867fa182ba69c310
-Head: f44db4e0cb7c822c7b9886882d6f502d183d9392
+Previous: 383640af505209ca158a4c758cc52eb5d7269778
+Head: 32da39f04ff1a232baf630874734637fed38deb4
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -14,9 +14,9 @@ Applied:
   rs-opt-inline: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
   pre-qpsize: 759e79f3ddc24bd32b323ccda6c0cc7eea60bbd4
   rs-states: f44db4e0cb7c822c7b9886882d6f502d183d9392
+  rs-def-qpsize: 32da39f04ff1a232baf630874734637fed38deb4
 Unapplied:
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
-  rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   rstream-opt: dd89287ce678fa211e3f427497f42e447c48b56d
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/rs-def-qpsize b/patches/rs-def-qpsize
index 46eaf49f04d2d8266d34638cfb607518ec7962d6..2e82e27463f5d9eb726311c398a3da83c4229f86 100644 (file)
--- a/patches/rs-def-qpsize
+++ b/patches/rs-def-qpsize
@@ -1,5 +1,5 @@
-Bottom: 10c0603e82f16fda92188aa5294c129cab457160
-Top:    40360dccfdc90246ade8113c0fc63bee52ca7731
+Bottom: 53ca16769d700d40a9cc9ff9550f5261e5354ea0
+Top:    042858a8e1a3b72db46c34a66204e8df2975744c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 14:31:12 -0700
 
@@ -16,7 +16,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index d68cb56..1140975 100644
+index b89ef42..c111797 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -54,7 +54,7 @@