pop

diff --git a/meta b/meta
index 34e74d6c3f957619b6855ad20c377db39f87bc01..e39f55c37ffdf61044c3ee9e3799e755ae019713 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: dabc8818f928b37db5a312ef27b5a2f160f32351
-Head: 87b32f6b164477e6d1917d1a4b7a52e7187f0ea9
+Previous: 91571394ba62c67e630358efed69a157ff6f58b9
+Head: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -12,8 +12,8 @@ Applied:
   rstream-bufsize: 6ce6ef9fdf294352623f93d9c648487e5f36080b
   rs-def-qpsize: 81e15fa8ac976f85a9cc0842564ad0edd5744311
   rs-1sge: 87b32f6b164477e6d1917d1a4b7a52e7187f0ea9
+  rs-def-inline: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
 Unapplied:
-  rs-def-inline: b9e71caf603fbed7f5bdcdad0adcafeaec70dbbf
   acm-sock: c5943b3ea4c22cade19dbbb35d898b0fad866c7a
   rs-with-acm: 07e5d1414b1cbad3e8106aca99f662bb3e4c580f
   pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e

diff --git a/patches/rs-def-inline b/patches/rs-def-inline
index 4fe9cd674050fa9cd5a75e39b7ee0e0a899db127..a4aa2fdee18accbfbda5c07dc7d1cdccbe174a5a 100644 (file)
--- a/patches/rs-def-inline
+++ b/patches/rs-def-inline
@@ -1,5 +1,5 @@
-Bottom: 04a5707f73e221ce55c9ce21d0e949a9de2b0c90
-Top:    a7e965c73c15582b33ef022098caf31113c775eb
+Bottom: f72cf21aae6b04bdcb43ae41b0f2c25c6ac1d7db
+Top:    aa33eb1e92aadaf0e564f6361ed0b56b5139b6ac
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 18:18:43 -0700