pop

diff --git a/meta b/meta
index 32d88c099b75291dff9bd5ef5c4d5ff2e408a683..9bd43ccf5ed5ccce859f22e7d8be35565a698944 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,13 @@
 Version: 1
-Previous: 655f5c71ebf33beee7ffb94a24b1950fbd250ab0
-Head: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
+Previous: 3243de10d672d0722be1eaf51ae0e93b1c917936
+Head: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-recv-hang: 9fe16d42109fffc021dce5a12e072815d7487b96
   rs-qpsize: 7d55c2586721ac9cd745495d689f3bb3c42f1cb5
+  rs-opts: 9068972ca69cfb2ad74c8d69641437a95bfb0e28
 Unapplied:
-  rs-opts: b8f05919dd1522e7298c6e94ea100671c4fb2f17
   rs-opt-qpsize: 624840f02ef94f140cdfae9d97c1d0235e4780d2
   rs-opt-inline: b624fedb7c85a3fa5b4911ebfe56815470248832
   pre-qpsize: 1d27a538d708554284968f9bf71cbe59fe5caead

diff --git a/patches/rs-opts b/patches/rs-opts
index d119deb070580cf4668df3293e74278dff24eed6..6f99a7987401800c6ec3e7fcfd4c79a3d6b37ac7 100644 (file)
--- a/patches/rs-opts
+++ b/patches/rs-opts
@@ -1,5 +1,5 @@
-Bottom: 46615b7edd3b4a8561c0e4419d89bdeb88db2e30
-Top:    25d50cd3051d3f2dd1864415bb489d3f72afdb61
+Bottom: 918eb94303796cba3dd40c4a754a411eb19992a9
+Top:    193d740232bd38b1fe0cecf8d619b84d9bb49e39
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:36:07 -0700
 
@@ -31,10 +31,10 @@ index 5310d33..87ee943 100644
                const void *optval, socklen_t optlen);
  int rgetsockopt(int socket, int level, int optname,
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 4e0671f..15e28de 100644
+index 59cc13c..ee31e0c 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1690,6 +1690,8 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1710,6 +1710,8 @@ int rsetsockopt(int socket, int level, int optname,
                        break;
                }
                break;
@@ -43,7 +43,7 @@ index 4e0671f..15e28de 100644
        default:
                break;
        }
-@@ -1755,6 +1757,9 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1775,6 +1777,9 @@ int rgetsockopt(int socket, int level, int optname,
                        break;
                }
                break;