pop

diff --git a/meta b/meta
index 8e795d83565dd1846a2e32ab231665161683bc88..a04f8257e8a875ecc91f2460b8fec42ed691d991 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 73e7b93c341fcbdd7a0d6eca8a6bc36a28f0feff
-Head: dba7b4833fd1208813028483451d389cbeecf02a
+Previous: 18be2848b80e466cff39b1ea41beebdf843980fc
+Head: 0680bea236f65373732b82d405787cf979ee5c67
 Applied:
+  rselect: 0680bea236f65373732b82d405787cf979ee5c67
 Unapplied:
   v6only: 3afce107e2baec86c5541ed0acd992e37bcb992a
-  rselect: 52ee17ec6697c63e048d2c875371e6ab452c0541
   shut_wr: cbdea5d2bc984ec26fcc85ee04cb77f76147e9de
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/rselect b/patches/rselect
index 1fbeb21430507d8e8e6c257f12006b45f115eed6..312fca5d7daf489444ed88377232c9288ffa8eaf 100644 (file)
--- a/patches/rselect
+++ b/patches/rselect
@@ -1,5 +1,5 @@
-Bottom: 27bfde2fb2ab4ee3033c6b465d55530a614e6bed
-Top:    47c055283ab722851373ec3c7f8affac14e1f08b
+Bottom: b2be28c058bcea1f57039dd4966c64ac692e6bfa
+Top:    af4cc3c64b7827f75b1392c03c0414ad0a869bca
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-25 15:04:52 -0700
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 394fed4..c833d46 100644
+index a3c2c6a..012bb5e 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,
+@@ -1630,7 +1630,7 @@ rs_poll_to_select(int nfds, struct pollfd *fds, fd_set *readfds,
        int i, cnt = 0;
  
        for (i = 0; i < nfds; i++) {