pop

diff --git a/meta b/meta
index b95ba42710cc0533d3cd8d8e158282b28b8d70ae..1332be7bd61fa48e8b5a9e7b4f150c44b04d2ec6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 7c5c87d96ce0952d98a2d838966324ca751db2fe
-Head: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
+Previous: 1172acede1023e3fdc53a13d1dbb77446938976d
+Head: 85dc4bf0936707526ecb0a52f419d6246f741f4d
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -10,8 +10,8 @@ Applied:
   pre-socket: 674e710e8ddca56a05d8c3611a36ba2613ff1cff
   rs-qpsize: 2d2f300c10b7039ee7c6a86341322988cca54883
   rs-opts: 07f689f1d2f7a5fcea5ba5b69eaa221fc5e7f476
+  rs-opt-qpsize: 85dc4bf0936707526ecb0a52f419d6246f741f4d
 Unapplied:
-  rs-opt-qpsize: 7a864c043ccadf0a1279309ca25bb86afc9c59d6
   rs-opt-inline: 1807a69a7b99c85be8d06aad947ba677e26ef658
   pre-qpsize: 080d7cb887b6038fb4d4a4a4aedc609a5488ce62
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f

diff --git a/patches/rs-opt-qpsize b/patches/rs-opt-qpsize
index d374f5e5c42df8c4a01751a8ee457f8cd48ead11..b7395bac064bc3de50fce42adb06bec77abde23b 100644 (file)
--- a/patches/rs-opt-qpsize
+++ b/patches/rs-opt-qpsize
@@ -1,5 +1,5 @@
-Bottom: 193d740232bd38b1fe0cecf8d619b84d9bb49e39
-Top:    72f7a43b64f1274756d81e397fc2c110bf58532b
+Bottom: b91c156d9e5c0d83c1e46e8d8e1677f305b7083d
+Top:    d6e483e384b1e66d2256c915ea3dd959ff2f0f89
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-18 16:56:15 -0700
 
@@ -37,7 +37,7 @@ index 87ee943..9fd9929 100644
  int rsetsockopt(int socket, int level, int optname,
                const void *optval, socklen_t optlen);
 diff --git a/src/cma.h b/src/cma.h
-index f28eaf3..2f5215c 100644
+index ffbcbf2..2ee4767 100644
 --- a/src/cma.h
 +++ b/src/cma.h
 @@ -67,6 +67,7 @@ static inline uint64_t htonll(uint64_t x) { return x; }