refresh

diff --git a/meta b/meta
index 041d77e33de2cfbb8993a9f859c54fcbffd5fea9..c9da7010b3331c25b5dec98924ba72147c4f5d0e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: efe4f6ae37afd1c36ae89d5556b462bb0518baa3
-Head: fec8b963fd7a8d147035d6e2382b8c4e650d4eb8
+Previous: 92398e01964154e68bde3abf55a77538ba1a1ca1
+Head: 7d5e6eaade683aea0fa189cffc3795b838a4f7e3
 Applied:
-  rs-iomap: d8a287dba3737e23dbebb8f72fc1de97413e5370
-  refresh-temp: fec8b963fd7a8d147035d6e2382b8c4e650d4eb8
+  rs-iomap: 7d5e6eaade683aea0fa189cffc3795b838a4f7e3
 Unapplied:
   riostream: 02d3e09949ffb41bdd1d8c039d582b621b8f4027
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index eb2b581..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 056b8bfd424c0057063f61bff98567c021510bde
-Top:    0f29fc79a2e44b45051dc6d32b885f356ac262aa
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-24 15:40:19 -0700
-
-Refresh of rs-iomap
-
----
-
-diff --git a/src/librdmacm.map b/src/librdmacm.map
-index 5c317a3..d5ef736 100644
---- a/src/librdmacm.map
-+++ b/src/librdmacm.map
-@@ -63,5 +63,8 @@ RDMACM_1.0 {
-               rselect;
-               rdma_get_src_port;
-               rdma_get_dst_port;
-+              riomap;
-+              riounmap;
-+              riowrite;
-       local: *;
- };

diff --git a/patches/rs-iomap b/patches/rs-iomap
index 1c61c0cb88dd93ccf52b0cfa0a4e596c85269094..adf9d7210d58594c951db9b2397d2df4974c9c40 100644 (file)
--- a/patches/rs-iomap
+++ b/patches/rs-iomap
@@ -1,5 +1,5 @@
 Bottom: daf53db464152f40dc8d6f2c99844510b03f8567
-Top:    056b8bfd424c0057063f61bff98567c021510bde
+Top:    0f29fc79a2e44b45051dc6d32b885f356ac262aa
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-10-21 14:16:03 -0700
 
@@ -272,6 +272,19 @@ index 26e7f98..0c5f388 100644
 +}
 +
 +#endif /* INDEXER_H */
+diff --git a/src/librdmacm.map b/src/librdmacm.map
+index 5c317a3..d5ef736 100644
+--- a/src/librdmacm.map
++++ b/src/librdmacm.map
+@@ -63,5 +63,8 @@ RDMACM_1.0 {
+               rselect;
+               rdma_get_src_port;
+               rdma_get_dst_port;
++              riomap;
++              riounmap;
++              riowrite;
+       local: *;
+ };
 diff --git a/src/rsocket.c b/src/rsocket.c
 index cc5effe..c534c61 100644
 --- a/src/rsocket.c