refresh

diff --git a/meta b/meta
index eda2ced4126e57fb67a42699faaeee854a69fbfe..5d7dce63bd65ca25dedff54acd40004104db2d06 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: ef451f943b9789bda17ad861f4f1d22311aacf2e
-Head: 6d2bc6bdfb2834d8645da5f41bb1c57bcef926e3
+Previous: eeb41523716145cb56ee594e0e3fe754d0f0bb76
+Head: b48e896757a21993ed2eac78662e02a54be5818e
 Applied:
   build-preload: 934949885dc5db0c30a70378b7fc8c36d512e32f
-  v1.0.16: e97c7571c5beb7860637ccc76c45387f84c9c234
-  refresh-temp: 6d2bc6bdfb2834d8645da5f41bb1c57bcef926e3
+  v1.0.16: b48e896757a21993ed2eac78662e02a54be5818e
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 74382e2..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,40 +0,0 @@
-Bottom: 220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Top:    dd9100c78043a50d5e9c1238081900b84158c7af
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-10 17:56:11 -0700
-
-Refresh of v1.0.16
-
----
-
-diff --git a/configure.in b/configure.in
-index 3ee7f9b..d4434c2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1,12 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_PREREQ(2.57)
--AC_INIT(librdmacm, 1.0.15, linux-rdma@vger.kernel.org)
-+AC_INIT(librdmacm, 1.0.16, linux-rdma@vger.kernel.org)
- AC_CONFIG_SRCDIR([src/cma.c])
- AC_CONFIG_AUX_DIR(config)
- AC_CONFIG_MACRO_DIR(config)
- AM_CONFIG_HEADER(config.h)
--AM_INIT_AUTOMAKE(librdmacm, 1.0.15)
-+AM_INIT_AUTOMAKE(librdmacm, 1.0.16)
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- AM_PROG_LIBTOOL
-diff --git a/librdmacm.spec.in b/librdmacm.spec.in
-index 4652bbc..575ce84 100644
---- a/librdmacm.spec.in
-+++ b/librdmacm.spec.in
-@@ -1,7 +1,7 @@
- %define ver @VERSION@
- 
- Name: librdmacm
--Version: 1.0.15
-+Version: 1.0.16
- Release: 1%{?dist}
- Summary: Userspace RDMA Connection Manager

diff --git a/patches/v1.0.16 b/patches/v1.0.16
index 1fe4a17c11c413a062ff2f5d9496f523d6e1323d..4e60f3b9c47c2e11150e66476613a3fcc76ffec8 100644 (file)
--- a/patches/v1.0.16
+++ b/patches/v1.0.16
@@ -1,5 +1,5 @@
 Bottom: 220121d634269cc5dec0c0d7bc1545acc1e3b8a9
-Top:    220121d634269cc5dec0c0d7bc1545acc1e3b8a9
+Top:    dd9100c78043a50d5e9c1238081900b84158c7af
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-10 17:55:32 -0700
 
@@ -10,4 +10,34 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/configure.in b/configure.in
+index 3ee7f9b..d4434c2 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1,12 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+ AC_PREREQ(2.57)
+-AC_INIT(librdmacm, 1.0.15, linux-rdma@vger.kernel.org)
++AC_INIT(librdmacm, 1.0.16, linux-rdma@vger.kernel.org)
+ AC_CONFIG_SRCDIR([src/cma.c])
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_MACRO_DIR(config)
+ AM_CONFIG_HEADER(config.h)
+-AM_INIT_AUTOMAKE(librdmacm, 1.0.15)
++AM_INIT_AUTOMAKE(librdmacm, 1.0.16)
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ 
+ AM_PROG_LIBTOOL
+diff --git a/librdmacm.spec.in b/librdmacm.spec.in
+index 4652bbc..575ce84 100644
+--- a/librdmacm.spec.in
++++ b/librdmacm.spec.in
+@@ -1,7 +1,7 @@
+ %define ver @VERSION@
+ 
+ Name: librdmacm
+-Version: 1.0.15
++Version: 1.0.16
+ Release: 1%{?dist}
+ Summary: Userspace RDMA Connection Manager