pop

diff --git a/meta b/meta
index d418483074fbe42bd2ed5c7fbd301fadb8fdbc85..b7038ddc9cf166fa3e4ce27412a76e279ab05293 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: cf24202b0d4d097c71bf258045f16c8af9912671
-Head: 666fa02d8f18ac2e98008cd3d57a90a864203548
+Previous: 0e867649db1397226450554233b9b0b190d4944b
+Head: 659f605c2d6bdba067651138aa5ffc01f14465d6
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -13,10 +13,10 @@ Applied:
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   acm-sock: dbc1a8fd27cad76749a228f01b8bf708832cdae0
   acm-init: 666fa02d8f18ac2e98008cd3d57a90a864203548
+  pre-socket: 659f605c2d6bdba067651138aa5ffc01f14465d6
 Unapplied:
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af
-  pre-socket: 22c8a9c659c882aa6820f8c1484e530b88428e36
   rs-states: 093242597614aefb205cdbebb14ce59775b11243
   rs-recv-hang: 7f62ace0f6bae5cc302bd58dd24ef5455229e1cb
   rstream-opt: e7db81a741c83da0739c078351abcc730465404a

diff --git a/patches/pre-socket b/patches/pre-socket
index 93c259317075377c4f916863948d88d05a2944d5..6bd33392c090db91b33d476e625169c1804f5d3f 100644 (file)
--- a/patches/pre-socket
+++ b/patches/pre-socket
@@ -1,5 +1,5 @@
-Bottom: b87b6dab315faf46f833cbc6c206d2df0910b8dc
-Top:    fbb83f69330642e2137a4cc6bd617b2cf9efb85b
+Bottom: ed5b3cf23ac01acbc57d249c7083577a19d344ce
+Top:    87ab98f3bddaca811ce2dc2b7920287c23686a20
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 12:42:12 -0700