pop

diff --git a/meta b/meta
index d980bc9eefd2810cea22d95a31739856510850e9..48956f97c1f18544240ce572ad3257fe20470749 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 5703525bae3c8f33ebbc2d4f4896922601bf835b
-Head: 38d296fd2fe1c5dd13b0b700b7c3900540475111
+Previous: 1577a5783273ba15196585d6283058767ed00466
+Head: 6fca24f9c3ef38a25321840802bcf16fdf7e3d4f
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -14,8 +14,8 @@ Applied:
   rs-1sge: 87b32f6b164477e6d1917d1a4b7a52e7187f0ea9
   rs-def-inline: 68f10687a682904b0c1a5d6c4e80de1e4de199e7
   acm-sock: 38d296fd2fe1c5dd13b0b700b7c3900540475111
+  rs-with-acm: 6fca24f9c3ef38a25321840802bcf16fdf7e3d4f
 Unapplied:
-  rs-with-acm: 07e5d1414b1cbad3e8106aca99f662bb3e4c580f
   pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e
   rs-states: 8b381e3287431e07386e4117098c3d538cb7731e
   rs-recv-hang: 6b48a1e8e4f5f3012a3c0620bbf3e19d08d60692

diff --git a/patches/rs-with-acm b/patches/rs-with-acm
index 38d4104a50bccd8f6c40e326555d42977f85df7f..a622803d16fea495130d119c90ad9d61c7e8e9b6 100644 (file)
--- a/patches/rs-with-acm
+++ b/patches/rs-with-acm
@@ -1,5 +1,5 @@
-Bottom: e6f4b7ff783807de43f848ce34738f61af33cd01
-Top:    d96457fd183426414dda37a6c7fd43ba793f7908
+Bottom: 155172426496d5a6df745360605d2c4e17d75888
+Top:    b882ceec6b7499e6a8c762dc8c1c0077c4a86ed2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 10:48:47 -0700