delete

diff --git a/meta b/meta
index ad4995e910d3b0b31e2b246570823745096e2617..6bdaf7eb02d8d07562caa9562e2c52d7ad64c85b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: f3ef356d874dfad1923796393e3396fde411c4f2
-Head: 85dc202db60854fa6214fd39fdab7cfea908078a
+Previous: 5d0edc0a75a660e501ae157be8ecee9b06c751ac
+Head: d1067d98830663fc9a95f6c9a502ac62d8e995a0
 Applied:
-  revert: 85dc202db60854fa6214fd39fdab7cfea908078a
 Unapplied:
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941
   rs-1sge: 85e4c4a0da0b501b60a1035d7a003ee20a749511

diff --git a/patches/revert b/patches/revert
deleted file mode 100644 (file)
index 28c924d..0000000
--- a/patches/revert
+++ /dev/null
@@ -1,39 +0,0 @@
-Bottom: 12cda031f6e4027c6df650d4c84ed637ba93cdf8
-Top:    12cda031f6e4027c6df650d4c84ed637ba93cdf8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-08 14:41:20 -0700
-
-rsockets: Revert commit 110fcad2ecce39d6888448c19b08791ea193e7f9
-
-It turns out ignoring the SHUT_WR shutdown flag introduces a
-separate issue with netperf.  From Sridhar Samudrala <sri@us.ibm.com> :
-
-This causes netperf to hang in recv() after shutdown(SHUT_WR)
-on the data socket.
-
-#0  0x000000805caa77e4 in __read_nocancel () from /lib64/libc.so.6
-#1  0x00000fff78e6422c in .read ()
-   from /home/sridhar/git/librdmacm/src/preload.so
-#2  0x000000805ccfe68c in .ibv_get_cq_event () from /usr/lib64/libibverbs.so.1
-#3  0x00000fff78e8a9d4 in rs_get_cq_event (rs=0x1000b85f220)
-    at src/rsocket.c:867
-#4  0x00000fff78e8c160 in rs_process_cq (rs=0x1000b85f220, 
-    nonblock=<value optimized out>, 
-    test=@0xfff78e9efc0: 0xfff78e899c0 <rs_conn_have_rdata>)
-    at src/rsocket.c:915
-#5  0x00000fff78e8d2c0 in rrecv (socket=<value optimized out>, 
-    buf=0xfffd897e428, len=1, flags=<value optimized out>)
-    at src/rsocket.c:1037
-#6  0x00000fff78e63eec in .recv ()
-   from /home/sridhar/git/librdmacm/src/preload.so
-#7  0x00000000100497f4 in .disconnect_data_socket ()
-#8  0x000000001004c528 in .send_omni_inner ()
-#9  0x00000000100502e0 in .send_tcp_stream ()
-#10 0x00000000100028a4 in .main ()
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-