refresh

diff --git a/meta b/meta
index e5d126385078e1ac88bddb2bff7ccccc11aa8f95..04b242727a51996d33e0d6fea881edfc3a12cab1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 175fae556c238fa95c13980d71b4bd2d535fa8dd
-Head: c0f770a9c1a337e4529c852bc7f4c3787ced77e1
+Previous: b9918fbe6452a80f470274e768eb32f78b2884fd
+Head: e8e442a6b71f4ea1c9d421b4549a8a09790ed9d2
 Applied:
-  dsocket: 41573d66880906ea1f2a0c546acadb15eb21b17b
-  refresh-temp: c0f770a9c1a337e4529c852bc7f4c3787ced77e1
+  dsocket: e8e442a6b71f4ea1c9d421b4549a8a09790ed9d2
 Unapplied:
   udpong: a003dda8e0d2f6ea134932bdd8bf5a5f29b7bfce
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7

diff --git a/patches/dsocket b/patches/dsocket
index dafd326b868b78ef8c56ba9645fd08c7917b8d2a..ade09e081597e7f8b965f7e6a61e211f418699f4 100644 (file)
--- a/patches/dsocket
+++ b/patches/dsocket
@@ -1,5 +1,5 @@
 Bottom: 1fa07c62817ac4b6cb8d9c5e327ea2cdc75dbd21
-Top:    8d2f75897b59b2230d826c1aa131f191ac2a54cb
+Top:    c4d4709d52e2de492239ded2a4b74e4ebde0db7a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-11-09 10:26:38 -0800
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/docs/rsocket b/docs/rsocket
-index 1484f65..a660208 100644
+index 1484f65..4192450 100644
 --- a/docs/rsocket
 +++ b/docs/rsocket
 @@ -1,7 +1,7 @@
@@ -25,7 +25,7 @@ index 1484f65..a660208 100644
  Rsockets is a protocol over RDMA that supports a socket-level API
  for applications.  For details on the current state of the
  implementation, readers should refer to the rsocket man page.  This
-@@ -189,3 +189,34 @@ registered remote data buffer.
+@@ -189,3 +189,35 @@ registered remote data buffer.
  From host A's perspective, the transfer appears as a normal send/write
  operation, with the data stream redirected directly into the receiving
  application's buffer.
@@ -59,7 +59,8 @@ index 1484f65..a660208 100644
 +A service thread is used to process messages received on the UDP socket.  This
 +thread updates the rsocket lookup tables with the remote QPN and path record
 +data.  The service thread forwards data received on the UDP socket to an
-+rsocket QP.
++rsocket QP.  After the remote QPN and path records have been resolved, datagram
++communication between two nodes are done over the UD QP.
 \ No newline at end of file
 diff --git a/src/cma.c b/src/cma.c
 index 388be61..ff9b426 100755

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c3c4c69..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 8d2f75897b59b2230d826c1aa131f191ac2a54cb
-Top:    c4d4709d52e2de492239ded2a4b74e4ebde0db7a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-18 15:05:17 -0800
-
-Refresh of dsocket
-
----
-
-diff --git a/docs/rsocket b/docs/rsocket
-index a660208..4192450 100644
---- a/docs/rsocket
-+++ b/docs/rsocket
-@@ -219,4 +219,5 @@ the send.
- A service thread is used to process messages received on the UDP socket.  This
- thread updates the rsocket lookup tables with the remote QPN and path record
- data.  The service thread forwards data received on the UDP socket to an
--rsocket QP.
-\ No newline at end of file
-+rsocket QP.  After the remote QPN and path records have been resolved, datagram
-+communication between two nodes are done over the UD QP.
-\ No newline at end of file