pop

diff --git a/meta b/meta
index 8e66890a0f27857d687ff144a112ed42a4b771e8..daa6fdc45dfa574f0712fb2b671c73a58b2ab795 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 02e128eecc3e5a18318ce5853d686510e6a1ec4b
-Head: dbc1a8fd27cad76749a228f01b8bf708832cdae0
+Previous: b0a91d937d95855fcfe9c0be758e9ec0977ffd18
+Head: 666fa02d8f18ac2e98008cd3d57a90a864203548
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -12,10 +12,10 @@ Applied:
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   acm-sock: dbc1a8fd27cad76749a228f01b8bf708832cdae0
+  rs-with-acm: 666fa02d8f18ac2e98008cd3d57a90a864203548
 Unapplied:
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af
-  rs-with-acm: 868314beb96c971d24f3a3a430bd36d3dbd20229
   pre-socket: 22c8a9c659c882aa6820f8c1484e530b88428e36
   rs-states: 093242597614aefb205cdbebb14ce59775b11243
   rs-recv-hang: 7f62ace0f6bae5cc302bd58dd24ef5455229e1cb

diff --git a/patches/rs-with-acm b/patches/rs-with-acm
index cc7ece585365ab97057547e385fbed10e8ed5358..f5cd118f79347f1c6dfe50bd103bbe5f444b39fe 100644 (file)
--- a/patches/rs-with-acm
+++ b/patches/rs-with-acm
@@ -1,5 +1,5 @@
-Bottom: 98d4ca9a26635ddb0c15dbb599a717a151308091
-Top:    b87b6dab315faf46f833cbc6c206d2df0910b8dc
+Bottom: f9da4f0a214d84797e29c62aa0628a78b3d890bd
+Top:    ed5b3cf23ac01acbc57d249c7083577a19d344ce
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 10:48:47 -0700