refresh

diff --git a/meta b/meta
index 8f2324a8dcf0073b8886983acdc5cf290a8c9a14..e102b564182f778a0635336b286bd82d4df693d3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: fb6df9ad2658a0c6bea575b247c574988e959c0c
-Head: 42fb6e12dd4e455a9a42f85357332784d8395629
+Previous: 8962bfaa99c4354a9cfc5ab012bb7c182451cbce
+Head: 8b381e3287431e07386e4117098c3d538cb7731e
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -16,8 +16,7 @@ Applied:
   acm-sock: c5943b3ea4c22cade19dbbb35d898b0fad866c7a
   rs-with-acm: 07e5d1414b1cbad3e8106aca99f662bb3e4c580f
   pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e
-  rs-states: eff8c0dccf93d5de5733d5d297606c146322c8e1
-  refresh-temp: 42fb6e12dd4e455a9a42f85357332784d8395629
+  rs-states: 8b381e3287431e07386e4117098c3d538cb7731e
 Unapplied:
   rs-recv-hang: 68b5404418c1c1ce39ae6d1d63d9520cdcc69abb
   rstream-conn: 9c97e8faa0d9592163ad516b921df31f0f64ae32

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 95e3a5f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: e102d5fd0fd35632eeafc6f3d2b1ffea21873167
-Top:    c9a2a77be772b959e4810744bb170212d1c48274
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-27 14:49:35 -0700
-
-Refresh of rs-states
-
----
-
-diff --git a/src/rsocket.c b/src/rsocket.c
-index 9beeddc..8cbd425 100644
---- a/src/rsocket.c
-+++ b/src/rsocket.c
-@@ -122,7 +122,7 @@ struct rs_conn_data {
- };
- 
- /*
-- * rsocket states are ordered as connecting, connected, disconnected.
-+ * rsocket states are ordered as passive, connecting, connected, disconnected.
-  */
- enum rs_state {
-       rs_init,

diff --git a/patches/rs-states b/patches/rs-states
index 7d7b6cab717651bba123559f715a4dd06f3eb290..b618d299cf2b9f448d502e9ac8e4962db90c8b6c 100644 (file)
--- a/patches/rs-states
+++ b/patches/rs-states
@@ -1,5 +1,5 @@
 Bottom: 0da8f3e659527977d6e1ca59cdaa0c341bbccb25
-Top:    e102d5fd0fd35632eeafc6f3d2b1ffea21873167
+Top:    c9a2a77be772b959e4810744bb170212d1c48274
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 17:28:44 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index e591116..9beeddc 100644
+index e591116..8cbd425 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -121,6 +121,9 @@ struct rs_conn_data {
@@ -19,7 +19,7 @@ index e591116..9beeddc 100644
  };
  
 +/*
-+ * rsocket states are ordered as connecting, connected, disconnected.
++ * rsocket states are ordered as passive, connecting, connected, disconnected.
 + */
  enum rs_state {
        rs_init,