pop

diff --git a/meta b/meta
index 81086d441bb03d4bb0c607773fbf63d2e306a5fc..8e66890a0f27857d687ff144a112ed42a4b771e8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: e77d58e1ecc2373d56221b03eca22de8811726ce
-Head: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
+Previous: 02e128eecc3e5a18318ce5853d686510e6a1ec4b
+Head: dbc1a8fd27cad76749a228f01b8bf708832cdae0
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -11,10 +11,10 @@ Applied:
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
+  acm-sock: dbc1a8fd27cad76749a228f01b8bf708832cdae0
 Unapplied:
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af
-  acm-sock: 11767dd5ff9823ee43369fd19a9c624ac4397360
   rs-with-acm: 868314beb96c971d24f3a3a430bd36d3dbd20229
   pre-socket: 22c8a9c659c882aa6820f8c1484e530b88428e36
   rs-states: 093242597614aefb205cdbebb14ce59775b11243

diff --git a/patches/acm-sock b/patches/acm-sock
index 2952d66eecee78429c67e8bc68e2aadfa9d774d4..8494f24097b9e37a2a038221766bc04d5e11809d 100644 (file)
--- a/patches/acm-sock
+++ b/patches/acm-sock
@@ -1,5 +1,5 @@
-Bottom: 72db6fd5f6da36c500e75eeab8e7d57b8bc60834
-Top:    98d4ca9a26635ddb0c15dbb599a717a151308091
+Bottom: 40360dccfdc90246ade8113c0fc63bee52ca7731
+Top:    f9da4f0a214d84797e29c62aa0628a78b3d890bd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 12:23:10 -0700