pop

diff --git a/meta b/meta
index 63ad80cfaf97495f0c1fc4b2ee1dd5b8d158f2b4..8f706db2cf10bda746e41ce2419f069741635519 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 590729ea3503d8bfecef8b99e572951bdf20b445
-Head: 85e4c4a0da0b501b60a1035d7a003ee20a749511
+Previous: b32300888649b1a15c36213f29968a82bf3a8eeb
+Head: 6ad70d3b80178e40fea97f662a6b31e51cddc0af
 Applied:
   destroy_cqs: 66410c265b2661e16b7f6126bcc4ea5c7e1af1bd
   conn-err: ac46465ae6061b06f005ba9b49b371c9eb0d2325
@@ -12,8 +12,8 @@ Applied:
   rstream-bufsize: 76a7691690cd14c123b4a3125598134edd567e1f
   rs-def-qpsize: 6895cd6a4d77d7f0c212af73ff4741c5c251b9e6
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511
+  rs-def-inline: 6ad70d3b80178e40fea97f662a6b31e51cddc0af
 Unapplied:
-  rs-def-inline: 50d6a49950b5ffc77b971e60c80045c5d70bda2b
   acm-sock: 11767dd5ff9823ee43369fd19a9c624ac4397360
   rs-with-acm: 868314beb96c971d24f3a3a430bd36d3dbd20229
   pre-socket: 22c8a9c659c882aa6820f8c1484e530b88428e36

diff --git a/patches/rs-def-inline b/patches/rs-def-inline
index 4c8c108dd8ee21f59c7fc98a74f314bf5fb3de16..cf90ab9b232b49928c2612b5e92b07ada6fa5e76 100644 (file)
--- a/patches/rs-def-inline
+++ b/patches/rs-def-inline
@@ -1,5 +1,5 @@
-Bottom: e8c78258fd1389fa7012b47fe14a62c9d0472281
-Top:    72db6fd5f6da36c500e75eeab8e7d57b8bc60834
+Bottom: e9e6fbdeef17d4c02f8c8aa86981e6965cd2d120
+Top:    ca334c09004719e129d514631e1e81d0bd614f71
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-24 18:18:43 -0700
 
@@ -26,7 +26,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/rsocket.c b/src/rsocket.c
-index 529c3b0..e591116 100644
+index bd4c8dd..6634e97 100644
 --- a/src/rsocket.c
 +++ b/src/rsocket.c
 @@ -51,7 +51,6 @@