pop

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

diff --git a/patches/rselect b/patches/rselect
index 9d874efe6e678d6b1a1c11939b95cff48b17e17c..8cc1060a0f1628df2c08a4d91554cc1331b2eef6 100644 (file)
--- a/patches/rselect
+++ b/patches/rselect
@@ -1,5 +1,5 @@
-Bottom: 44f8f1d4ce3fc0356402ae05bbe8b63c973a4865
-Top:    938168c7141b54196d5a134aca1fe7c88dcfb3b5
+Bottom: 27bfde2fb2ab4ee3033c6b465d55530a614e6bed
+Top:    47c055283ab722851373ec3c7f8affac14e1f08b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 15:04:52 -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 860c63e..ed994fe 100644
+index 394fed4..c833d46 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -1631,7 +1631,7 @@ rs_poll_to_select(int nfds, struct pollfd *fds, fd_set *readfds,