refresh

diff --git a/meta b/meta
index 2c89dd0138b3caf066742cc148e3952b879c5eaa..2dfebf888e41c6e98447b1627609850664724cf0 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 031a5a431ba47765c97f2f6e0e60a1b81ddd65a3
-Head: ee298a42167c40bafe7b4bdfcd57415105931012
+Previous: 6297090daa58d43533f796f16977ee05160af5e1
+Head: 157a20a937356fb540899b674d29959c386ae305
 Applied:
-  time-ex: e43c84fe9013f089f82d6000422b997b2d80fbe9
-  refresh-temp: ee298a42167c40bafe7b4bdfcd57415105931012
+  time-ex: 157a20a937356fb540899b674d29959c386ae305
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7dc70cd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 2ab79436b858f0bf24ff91555665a0823faef381
-Top:    f7098734b90e3bb9a92221c046446891d12d7264
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-08-07 17:27:58 -0700
-
-Refresh of time-ex
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index e1be9f3..08582d3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -54,6 +54,8 @@ examples_rcopy_SOURCES = examples/rcopy.c
- examples_rcopy_LDADD = $(top_builddir)/src/librdmacm.la
- examples_udpong_SOURCES = examples/udpong.c examples/common.c
- examples_udpong_LDADD = $(top_builddir)/src/librdmacm.la
-+examples_cmtime_SOURCES = examples/cmtime.c examples/common.c
-+examples_cmtime_LDADD = $(top_builddir)/src/librdmacm.la
- 
- librdmacmincludedir = $(includedir)/rdma
- infinibandincludedir = $(includedir)/infiniband

diff --git a/patches/time-ex b/patches/time-ex
index f6b728303faea95f5206b023f28a4721f64ce1a8..97982afe8ea2cd1e50e83b6e7f23e33488464674 100644 (file)
--- a/patches/time-ex
+++ b/patches/time-ex
@@ -1,5 +1,5 @@
 Bottom: 2ab79436b858f0bf24ff91555665a0823faef381
-Top:    2ab79436b858f0bf24ff91555665a0823faef381
+Top:    f7098734b90e3bb9a92221c046446891d12d7264
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-08-05 10:57:43 -0700
 
@@ -8,4 +8,16 @@ example to time rdma cm calls
 
 ---
 
-
+diff --git a/Makefile.am b/Makefile.am
+index e1be9f3..08582d3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -54,6 +54,8 @@ examples_rcopy_SOURCES = examples/rcopy.c
+ examples_rcopy_LDADD = $(top_builddir)/src/librdmacm.la
+ examples_udpong_SOURCES = examples/udpong.c examples/common.c
+ examples_udpong_LDADD = $(top_builddir)/src/librdmacm.la
++examples_cmtime_SOURCES = examples/cmtime.c examples/common.c
++examples_cmtime_LDADD = $(top_builddir)/src/librdmacm.la
+ 
+ librdmacmincludedir = $(includedir)/rdma
+ infinibandincludedir = $(includedir)/infiniband