From 10fc5fdb2b9136a0439543d5c5a6d7498e91a354 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 5 Mar 2013 17:18:45 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 28 ---------------------------- patches/release | 22 ++++++++++++++++++++-- 3 files changed, 23 insertions(+), 34 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 2e6b7991..d340c168 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 3290a7603182ad895f4b9aa678758e7a759d592b -Head: 8850196d99c6050c9781eb6886a0688c5a74fe1f +Previous: c834a96941b9c2b8c0308a068b23e4701050ac35 +Head: 3e9ba4d510bf4eb11837f978eeeac1ed988a3484 Applied: - release: 2cfecfae829520da7419f40cb490d63e106f32c1 - refresh-temp: 8850196d99c6050c9781eb6886a0688c5a74fe1f + release: 3e9ba4d510bf4eb11837f978eeeac1ed988a3484 Unapplied: xfer-cnt: 52a03dfbd23c1f257303d05c489041eb75ce76eb af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 1b4e8e40..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,28 +0,0 @@ -Bottom: 2737e70c64c9617bb741fff20192947019c4f7d9 -Top: d7fffdc40073d95d98b9d5c01c5c865b7caa0c69 -Author: Sean Hefty -Date: 2013-03-05 17:18:45 -0800 - -Refresh of release - ---- - -diff --git a/configure.in b/configure.in -index d4434c2..b72d0aa 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.16, linux-rdma@vger.kernel.org) -+AC_INIT(librdmacm, 1.0.17, 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.16) -+AM_INIT_AUTOMAKE(librdmacm, 1.0.17) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - AM_PROG_LIBTOOL diff --git a/patches/release b/patches/release index edec2ce7..539a39b2 100644 --- a/patches/release +++ b/patches/release @@ -1,5 +1,5 @@ Bottom: 2737e70c64c9617bb741fff20192947019c4f7d9 -Top: 2737e70c64c9617bb741fff20192947019c4f7d9 +Top: d7fffdc40073d95d98b9d5c01c5c865b7caa0c69 Author: Sean Hefty Date: 2013-03-05 17:18:11 -0800 @@ -8,4 +8,22 @@ librdmacm: Release 1.0.17 --- - +diff --git a/configure.in b/configure.in +index d4434c2..b72d0aa 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.16, linux-rdma@vger.kernel.org) ++AC_INIT(librdmacm, 1.0.17, 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.16) ++AM_INIT_AUTOMAKE(librdmacm, 1.0.17) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + + AM_PROG_LIBTOOL -- 2.46.0