pop

diff --git a/meta b/meta
index 90fb34d94837397bde2ec8961aebef0a9a827e6e..f4627e939ebc83049b92cc17aebab317de310d1e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 6b96cb788b063a5ca03509e29b77ad588c66088b
-Head: 1807a69a7b99c85be8d06aad947ba677e26ef658
+Previous: 2e36e893181f0e5925ea987307526c7d9d64c079
+Head: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -9,8 +9,8 @@ Applied:
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
   rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
   rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658
+  pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
 Unapplied:
-  pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   acm-sock: dbc1a8fd27cad76749a228f01b8bf708832cdae0

diff --git a/patches/pre-qpsize b/patches/pre-qpsize
index 9f2758ee41b18c55d0eabda72e2aecedc511c27b..69b4e0c47bccd4834aac104a557364e138c29c6f 100644 (file)
--- a/patches/pre-qpsize
+++ b/patches/pre-qpsize
@@ -1,5 +1,5 @@
-Bottom: 92d3cde2ac0d83630c3f7f2c7e438da3bc5daa28
-Top:    f33552f90d8a633f18fafcbe74fcba702da0d5c4
+Bottom: 8741a1d852238e29ca2c917ec275c4bdc651f38f
+Top:    c042562c54c7fcb7925b0af4c00d669c58102958
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 18:46:36 -0700