pop

diff --git a/meta b/meta
index 1332be7bd61fa48e8b5a9e7b4f150c44b04d2ec6..d28fab1e6ffee992c45d730b6d40ae852bd0f196 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 1172acede1023e3fdc53a13d1dbb77446938976d
-Head: 85dc4bf0936707526ecb0a52f419d6246f741f4d
+Previous: 9e733728929de1378a7da999569e2067dd110d64
+Head: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -11,8 +11,8 @@ Applied:
   rs-qpsize: 2d2f300c10b7039ee7c6a86341322988cca54883
   rs-opts: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
   rs-opt-qpsize: 85dc4bf0936707526ecb0a52f419d6246f741f4d
+  rs-opt-inline: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
 Unapplied:
-  rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6

diff --git a/patches/rs-opt-inline b/patches/rs-opt-inline
index 6b9f2d4cf10a46d62f8b821804d6b164aa3daf2f..57359ad37524470252f506d427fd39b0946efcaa 100644 (file)
--- a/patches/rs-opt-inline
+++ b/patches/rs-opt-inline
@@ -1,5 +1,5 @@
-Bottom: 72f7a43b64f1274756d81e397fc2c110bf58532b
-Top:    8741a1d852238e29ca2c917ec275c4bdc651f38f
+Bottom: d6e483e384b1e66d2256c915ea3dd959ff2f0f89
+Top:    546fb8c731a40bcc37a8cd00b701dc5aea7b1f0d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-22 11:39:21 -0700