pop

diff --git a/meta b/meta
index 15ee5ae3f0615cd1a19f8b38e5cd65cd2b280dda..3951baa953ae9d66a7ff704fcf87969b097ae2bc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 9290890d054e921b63823301634ac2063b7f7064
-Head: 950e3a6667196c14d0f9457d56e53e02d715581b
+Previous: 5ade49db3a67b8703207be52a9bdfb93f1788b55
+Head: 8bb130768eb387930a7b80dd7d88019fe7d06e21
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
   rs-qpsize: 950e3a6667196c14d0f9457d56e53e02d715581b
+  rs-opts: 8bb130768eb387930a7b80dd7d88019fe7d06e21
 Unapplied:
-  rs-opts: f740a919d0a8db62f7ade2abd5a2ae2c30cae5da
   rs-opt-qpsize: a7f84f6a6f05cca339daf568b1512fdaea7d174e
   rs-opt-inline: 03ba92b610e7053a2f21d20db854100a5427b0d9
   pre-qpsize: a31a660f2d607a6c17c75763c5e9b67c4742b658

diff --git a/patches/rs-opts b/patches/rs-opts
index 23db7d0788373e799f7c4f67098f3835cac6bfc8..fa9ebce00dacb30af3dccc1c026ccdf1edbaced4 100644 (file)
--- a/patches/rs-opts
+++ b/patches/rs-opts
@@ -1,5 +1,5 @@
-Bottom: b9ce68c6e1cb0fcfe7357714e1ebfef12bcdb15d
-Top:    a56e016c539a26a00f6719ca5ac0b7574ce02b22
+Bottom: e59c7d297d75ab32441e4182b0c9e524692ce2c2
+Top:    720643e5aab06d22102e65d1e8b2d0dda9a83c98
 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 6cf492a..9d373b9 100644
+index 388cf90..9efdbfa 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
-@@ -1694,6 +1694,8 @@ int rsetsockopt(int socket, int level, int optname,
+@@ -1693,6 +1693,8 @@ int rsetsockopt(int socket, int level, int optname,
                        break;
                }
                break;
@@ -43,7 +43,7 @@ index 6cf492a..9d373b9 100644
        default:
                break;
        }
-@@ -1759,6 +1761,9 @@ int rgetsockopt(int socket, int level, int optname,
+@@ -1758,6 +1760,9 @@ int rgetsockopt(int socket, int level, int optname,
                        break;
                }
                break;