pop

diff --git a/meta b/meta
index 7d937081bc30f92620fc4428fea40d81f4d20a3c..24756cb47c71fc48d4586eeeeb72ea72b4a436e5 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: c30718458b1fcbcce07591cb3aa72cc5b0ddaac3
-Head: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
+Previous: 7fa398fb570d02aa95fd6681f062186727e5ee9e
+Head: ac46465ae6061b06f005ba9b49b371c9eb0d2325
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
+  conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
 Unapplied:
   rs-qpsize: 6cf5decea0887b832750814aeff793b10a9e5816
-  conn-err: 2d28d3ac1d7536a7ea2e699388b28df61455da6b
   rs-opts: 7c8fbc95903cf8f61422d7f2c58f83ba4f0b8ac4
   rs-opt-qpsize: 6b732ff34d98cf8745e2f5d2ff326cef4a3b05a7
 Hidden:

diff --git a/patches/conn-err b/patches/conn-err
index fef229bcb7224eb6112c9b8a6dd0da006d54d11b..64604d47d0736b22f60db3d3b5b3946ebe1ed710 100644 (file)
--- a/patches/conn-err
+++ b/patches/conn-err
@@ -1,5 +1,5 @@
-Bottom: 7292817ed24068611ad6cac825c4f26c8476920e
-Top:    e59c7d297d75ab32441e4182b0c9e524692ce2c2
+Bottom: d551dadf671871078fc6a8314f4015e8e5d6e78a
+Top:    f1dcc179b934b653b4de6f28bbbed627b9fc6acd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-21 16:39:46 -0700