pop

diff --git a/meta b/meta
index 0e582e94011f8da8a7aed06064c52a48577fa514..fe58b9e9a1cc48716fe9afc375994b8d7c982d47 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: db24c460865a6decfa3b7e8fae604bc9b7b38668
-Head: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
+Previous: f8af58b04bfe326e34e3784bc17d219e83cc870d
+Head: b6b9b190f9360838805efed5a2f097e6beb7d5a4
 Applied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
   rselect: 7d25968d337e976e0e22fdba69c8a2a2f5d35008
+  shut_wr: b6b9b190f9360838805efed5a2f097e6beb7d5a4
 Unapplied:
-  shut_wr: 1b1163ede00a5161a9790cbc1e23cf15737dc2e3
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
 Hidden:

diff --git a/patches/shut_wr b/patches/shut_wr
index 42fbd9beb0b3a501dae1656c1ce932635da49307..82a151c09de8d606849aa4a0c8b4588312a2bf57 100644 (file)
--- a/patches/shut_wr
+++ b/patches/shut_wr
@@ -1,5 +1,5 @@
-Bottom: 938168c7141b54196d5a134aca1fe7c88dcfb3b5
-Top:    628bde79ad910c1eec4036abc1f102ef7b304bc8
+Bottom: 47c055283ab722851373ec3c7f8affac14e1f08b
+Top:    9c6317e02ea13b4c7c116bc0ca8be00c54af4ed4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 14:19:54 -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 ed994fe..8e8a9d9 100644
+index c833d46..a25c31a 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -96,7 +96,8 @@ enum {