From 24627ede13f8342d4418e711225e1ee46d0966af Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 2 Jun 2015 09:26:05 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 34 ---------------------------------- patches/v1.0.21 | 28 ++++++++++++++++++++++++++-- 3 files changed, 29 insertions(+), 40 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 5fd0de31..3a147e17 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 3f2e5eb8543b16d291c04ddb51af2c1d244a1fe1 -Head: 492b207a7e44af456f867d068c7dc85315ba65ed +Previous: e0950810496dff84bb75b4f22fec4611b4ee14c8 +Head: 2b12e34acba13bb9d266704d51e871e2581c90e4 Applied: - v1.0.21: 31df29fb6ac727eea297ac74e8d8b3371b29999a - refresh-temp: 492b207a7e44af456f867d068c7dc85315ba65ed + v1.0.21: 2b12e34acba13bb9d266704d51e871e2581c90e4 Unapplied: raccept-invalid: 8d5251952074622e8be0c9828d5eb573b4a1c6d2 old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 13dc935d..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,34 +0,0 @@ -Bottom: ba0e63b777474cf9c3176c7ae793e229dbdff16f -Top: cb45ab0049788b30deefcbf1754ba0a292fd83a6 -Author: Sean Hefty -Date: 2015-06-02 09:26:04 -0700 - -Refresh of v1.0.21 - ---- - -diff --git a/configure.ac b/configure.ac -index e18af28..768e257 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - - AC_PREREQ([2.63]) --AC_INIT([librdmacm],[1.0.20],[linux-rdma@vger.kernel.org]) -+AC_INIT([librdmacm],[1.0.21],[linux-rdma@vger.kernel.org]) - AC_CONFIG_SRCDIR([src/cma.c]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) -diff --git a/librdmacm.spec.in b/librdmacm.spec.in -index 197836c..53a39e6 100644 ---- a/librdmacm.spec.in -+++ b/librdmacm.spec.in -@@ -1,7 +1,7 @@ - %define ver @VERSION@ - - Name: librdmacm --Version: 1.0.20 -+Version: 1.0.21 - Release: 1%{?dist} - Summary: Userspace RDMA Connection Manager diff --git a/patches/v1.0.21 b/patches/v1.0.21 index a9a3e5db..8c5e93a9 100644 --- a/patches/v1.0.21 +++ b/patches/v1.0.21 @@ -1,5 +1,5 @@ Bottom: ba0e63b777474cf9c3176c7ae793e229dbdff16f -Top: ba0e63b777474cf9c3176c7ae793e229dbdff16f +Top: cb45ab0049788b30deefcbf1754ba0a292fd83a6 Author: Sean Hefty Date: 2015-06-02 09:25:21 -0700 @@ -10,4 +10,28 @@ Signed-off-by: Sean Hefty --- - +diff --git a/configure.ac b/configure.ac +index e18af28..768e257 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_PREREQ([2.63]) +-AC_INIT([librdmacm],[1.0.20],[linux-rdma@vger.kernel.org]) ++AC_INIT([librdmacm],[1.0.21],[linux-rdma@vger.kernel.org]) + AC_CONFIG_SRCDIR([src/cma.c]) + AC_CONFIG_AUX_DIR(config) + AC_CONFIG_MACRO_DIR(config) +diff --git a/librdmacm.spec.in b/librdmacm.spec.in +index 197836c..53a39e6 100644 +--- a/librdmacm.spec.in ++++ b/librdmacm.spec.in +@@ -1,7 +1,7 @@ + %define ver @VERSION@ + + Name: librdmacm +-Version: 1.0.20 ++Version: 1.0.21 + Release: 1%{?dist} + Summary: Userspace RDMA Connection Manager -- 2.41.0