pop

diff --git a/meta b/meta
index e39f55c37ffdf61044c3ee9e3799e755ae019713..d980bc9eefd2810cea22d95a31739856510850e9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 91571394ba62c67e630358efed69a157ff6f58b9
-Head: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
+Previous: 5703525bae3c8f33ebbc2d4f4896922601bf835b
+Head: 38d296fd2fe1c5dd13b0b700b7c3900540475111
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -13,8 +13,8 @@ Applied:
   rs-def-qpsize: 81e15fa8ac976f85a9cc0842564ad0edd5744311
   rs-1sge: 87b32f6b164477e6d1917d1a4b7a52e7187f0ea9
   rs-def-inline: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
+  acm-sock: 38d296fd2fe1c5dd13b0b700b7c3900540475111
 Unapplied:
-  acm-sock: c5943b3ea4c22cade19dbbb35d898b0fad866c7a
   rs-with-acm: 07e5d1414b1cbad3e8106aca99f662bb3e4c580f
   pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e
   rs-states: 8b381e3287431e07386e4117098c3d538cb7731e

diff --git a/patches/acm-sock b/patches/acm-sock
index c5ad53d3302fa85a706298cbfbd4ff068ac9a12c..44319ad09733304f87e64f0ce67370fa80bb83a5 100644 (file)
--- a/patches/acm-sock
+++ b/patches/acm-sock
@@ -1,5 +1,5 @@
-Bottom: a7e965c73c15582b33ef022098caf31113c775eb
-Top:    e6f4b7ff783807de43f848ce34738f61af33cd01
+Bottom: aa33eb1e92aadaf0e564f6361ed0b56b5139b6ac
+Top:    155172426496d5a6df745360605d2c4e17d75888
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 12:23:10 -0700