pop

diff --git a/meta b/meta
index 9ea888eba3acacd823d1c83d2014717ae3bb1800..d3fc32aa86460d1cbe296c28a709d969387fa79f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 72ba255f269ac5c37c09f987013adfdb4d530b26
-Head: 9fe16d42109fffc021dce5a12e072815d7487b96
+Previous: 5d0368ce3c4ec2f127f9cdeb61daf7366717056c
+Head: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
+  acm-sock: 01c3d7c91ac260f51823999eeb998dcb5c4a20c7
 Unapplied:
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
   rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
@@ -13,7 +14,6 @@ Unapplied:
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  acm-sock: dbc1a8fd27cad76749a228f01b8bf708832cdae0
   acm-init: 666fa02d8f18ac2e98008cd3d57a90a864203548
   pre-socket: 659f605c2d6bdba067651138aa5ffc01f14465d6
   rs-states: 94e4650160dd8b32efd7e1befe3b179487bd7cac

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