pop

diff --git a/meta b/meta
index 92caaa5cca6e923fac7b2da58def1f72c0d772a0..b95ba42710cc0533d3cd8d8e158282b28b8d70ae 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 5af8556f4e63775bcfc13030432080e0c9318300
-Head: 2d2f300c10b7039ee7c6a86341322988cca54883
+Previous: 7c5c87d96ce0952d98a2d838966324ca751db2fe
+Head: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -9,8 +9,8 @@ Applied:
   acm-init: 272c3cc024d0e5854cbafa6c2f1e8560398a68d7
   pre-socket: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
   rs-qpsize: 2d2f300c10b7039ee7c6a86341322988cca54883
+  rs-opts: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
 Unapplied:
-  rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
   rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
   rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62

diff --git a/patches/rs-opts b/patches/rs-opts
index 6f99a7987401800c6ec3e7fcfd4c79a3d6b37ac7..2da1e7033a84cc13f66fa5e853d0bc7891aabc7f 100644 (file)
--- a/patches/rs-opts
+++ b/patches/rs-opts
@@ -1,5 +1,5 @@
-Bottom: 918eb94303796cba3dd40c4a754a411eb19992a9
-Top:    193d740232bd38b1fe0cecf8d619b84d9bb49e39
+Bottom: 54969dd5cadb4809451a5469fc6fd15e6bf7e1ff
+Top:    b91c156d9e5c0d83c1e46e8d8e1677f305b7083d
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:36:07 -0700