From f9ca9e39cdcf90003a5681d81ffb85674cf33125 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Sun, 27 May 2012 14:48:22 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/rs-recv-hang | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta b/meta index d7b3beac..59ade91c 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 9be0f3c2bf822a430624ada94e1e50f238081bd9 -Head: eff8c0dccf93d5de5733d5d297606c146322c8e1 +Previous: c61df1c1dd91de3f89ae322f833afc1f3ecfd0d4 +Head: 68b5404418c1c1ce39ae6d1d63d9520cdcc69abb Applied: destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325 @@ -17,7 +17,7 @@ Applied: rs-with-acm: 07e5d1414b1cbad3e8106aca99f662bb3e4c580f pre-socket: b1ebf860954fccf5518d982a5c5d0e9939da969e rs-states: eff8c0dccf93d5de5733d5d297606c146322c8e1 + rs-recv-hang: 68b5404418c1c1ce39ae6d1d63d9520cdcc69abb Unapplied: - rs-recv-hang: 5c5e799434005a8ac1c4d6088aa2820d4511206a rstream-conn: 9c97e8faa0d9592163ad516b921df31f0f64ae32 Hidden: diff --git a/patches/rs-recv-hang b/patches/rs-recv-hang index 4f2d9064..b4e69d07 100644 --- a/patches/rs-recv-hang +++ b/patches/rs-recv-hang @@ -1,5 +1,5 @@ -Bottom: 21cab4e0e2179a70e55cee483fbfdabf4510108a -Top: a9bac6f88801ea442e2b5d0736b252bd4e10d3f7 +Bottom: e102d5fd0fd35632eeafc6f3d2b1ffea21873167 +Top: 4e57522ff607a81366ad0e90a019aa2646141a0e Author: Sean Hefty Date: 2012-05-25 17:24:08 -0700 @@ -18,7 +18,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/rsocket.c b/src/rsocket.c -index 70d0c46..e13613b 100644 +index 9beeddc..80f3ff7 100644 --- a/src/rsocket.c +++ b/src/rsocket.c @@ -937,6 +937,11 @@ static int rs_can_send(struct rsocket *rs) -- 2.41.0