pop

diff --git a/meta b/meta
index 1d75726afd1b273484ba3635f03300220234cb18..34f30f07b84ca6437920fdafa9e854876333ec25 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 94dafaf25dbb958fe5b25363a81b2011682e98e9
-Head: c6663b8beca52500bd665a8487d3edc6388e912c
+Previous: 42056b2e5835ec3ea17de238f8f52a6d2276abfb
+Head: 110fcad2ecce39d6888448c19b08791ea193e7f9
 Applied:
+  rs-shutdown: 110fcad2ecce39d6888448c19b08791ea193e7f9
 Unapplied:
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
-  rs-shutdown: 78a7f11e7c93c953a745134cd61e63a415642cf5
   rs-maxseg: 3593589a3e9bfc8bbaab75b45e090182313a69dc
   rs-spin: a0d1e796acd395c573a1b6d11dcdae09bd5d1b09
   rs-defaults: 789cb60192f30396cc0ad7940fdd402bdce127f0

diff --git a/patches/rs-shutdown b/patches/rs-shutdown
index 1ac2580dbc8b4877fc4f5559a38fc323a7ecf740..4ecc4001bf1ea8bc6d991e236a3821cef0ac0fc5 100644 (file)
--- a/patches/rs-shutdown
+++ b/patches/rs-shutdown
@@ -1,5 +1,5 @@
-Bottom: 0c5a0c24885960bf61c5afe1b2ef070808c1f084
-Top:    684e21cf3e81b4f5bd740456e0fea103e52d7d1f
+Bottom: d79d5464622c07a1ee7c42051fee5fca02c52207
+Top:    5e0be3cec4b1092b15ffff22ce847641d572b180
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-04 13:14:42 -0700
 
@@ -23,10 +23,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 8b1e930..a1679f1 100644
+index c111797..8f20b4a 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1593,6 +1593,9 @@ int rshutdown(int socket, int how)
+@@ -1592,6 +1592,9 @@ int rshutdown(int socket, int how)
        struct rsocket *rs;
        int ret = 0;