pop

diff --git a/meta b/meta
index 8323bc829fb333e797930bbfdfce08e0574e166e..1106f0739d015e6bd987ef75f3aa36eb9e3b6693 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 505cb78288398a4be3d5fc947063e0726c1b506a
-Head: 759e79f3ddc24bd32b323ccda6c0cc7eea60bbd4
+Previous: 2035d79f258965254daccfd1867fa182ba69c310
+Head: f44db4e0cb7c822c7b9886882d6f502d183d9392
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -13,10 +13,10 @@ Applied:
   rs-opt-qpsize: 85dc4bf0936707526ecb0a52f419d6246f741f4d
   rs-opt-inline: cfbfe46cc8ed558bdf26be49ff0a055935012c7b
   pre-qpsize: 759e79f3ddc24bd32b323ccda6c0cc7eea60bbd4
+  rs-states: f44db4e0cb7c822c7b9886882d6f502d183d9392
 Unapplied:
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
-  rs-states: 94e4650160dd8b32efd7e1befe3b179487bd7cac
   rstream-opt: dd89287ce678fa211e3f427497f42e447c48b56d
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
   rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af

diff --git a/patches/rs-states b/patches/rs-states
index 64d9e5ef0868ed6a64c80f58461e59616cfbdbe8..37933043ac96230ab47f86ab915c4624b50557c0 100644 (file)
--- a/patches/rs-states
+++ b/patches/rs-states
@@ -1,5 +1,5 @@
-Bottom: 87ab98f3bddaca811ce2dc2b7920287c23686a20
-Top:    82e13151ae7719d96c8c400a99918961bc514175
+Bottom: 4b2610b05b4530b8bac8ed3c4f6cb13318ba63ae
+Top:    53ca16769d700d40a9cc9ff9550f5261e5354ea0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-25 17:28:44 -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 1140975..9ce58d5 100644
+index ef070a8..b89ef42 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -126,6 +126,9 @@ union rs_wr_id {
@@ -35,7 +35,7 @@ index 1140975..9ce58d5 100644
        rs_error
  };
  
-@@ -1011,9 +1014,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
+@@ -1021,9 +1024,7 @@ ssize_t rrecv(int socket, void *buf, size_t len, int flags)
        int ret;
  
        rs = idm_at(&idm, socket);
@@ -46,7 +46,7 @@ index 1140975..9ce58d5 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1115,7 +1116,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
+@@ -1125,7 +1126,7 @@ ssize_t rsend(int socket, const void *buf, size_t len, int flags)
        int ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -55,7 +55,7 @@ index 1140975..9ce58d5 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1219,7 +1220,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
+@@ -1234,7 +1235,7 @@ static ssize_t rsendv(int socket, const struct iovec *iov, int iovcnt, int flags
        int i, ret = 0;
  
        rs = idm_at(&idm, socket);
@@ -64,7 +64,7 @@ index 1140975..9ce58d5 100644
                ret = rs_do_connect(rs);
                if (ret) {
                        if (errno == EINPROGRESS)
-@@ -1360,7 +1361,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
+@@ -1380,7 +1381,7 @@ static int rs_poll_rs(struct rsocket *rs, int events,
                        revents |= POLLOUT;
                if (rs->state == rs_disconnected)
                        revents |= POLLHUP;
@@ -73,7 +73,7 @@ index 1140975..9ce58d5 100644
                        revents |= POLLERR;
  
                return revents;
-@@ -1401,16 +1402,11 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
+@@ -1421,16 +1422,11 @@ static int rs_poll_arm(struct pollfd *rfds, struct pollfd *fds, nfds_t nfds)
                        if (fds[i].revents)
                                return 1;