pop

diff --git a/meta b/meta
index 48956f97c1f18544240ce572ad3257fe20470749..8589b126a6bdfa14f3f2f427d3a6b68571c83cb6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 1577a5783273ba15196585d6283058767ed00466
-Head: 6fca24f9c3ef38a25321840802bcf16fdf7e3d4f
+Previous: 6e1f6f77d4a5945575f35a244ea873b889836db2
+Head: 90d45cd75ac12bc966bea68dc3ac38f63605442c
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -15,8 +15,8 @@ Applied:
   rs-def-inline: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
   acm-sock: 38d296fd2fe1c5dd13b0b700b7c3900540475111
   rs-with-acm: 6fca24f9c3ef38a25321840802bcf16fdf7e3d4f
+  pre-socket: 90d45cd75ac12bc966bea68dc3ac38f63605442c
 Unapplied:
-  pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e
   rs-states: 8b381e3287431e07386e4117098c3d538cb7731e
   rs-recv-hang: 6b48a1e8e4f5f3012a3c0620bbf3e19d08d60692
   rstream-conn: d7f21c0d63daf2cabdf9175d0d27628c132f5b57

diff --git a/patches/pre-socket b/patches/pre-socket
index c98beb99174941c81d0f74c3deaeef448f09dda2..ed2ef52476b2e3fe713b4da404bc5ca3f6a9b7e3 100644 (file)
--- a/patches/pre-socket
+++ b/patches/pre-socket
@@ -1,5 +1,5 @@
-Bottom: d96457fd183426414dda37a6c7fd43ba793f7908
-Top:    0da8f3e659527977d6e1ca59cdaa0c341bbccb25
+Bottom: b882ceec6b7499e6a8c762dc8c1c0077c4a86ed2
+Top:    108ed67233ea78a253e5631363bd1ff52254a5d8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 12:42:12 -0700