refresh

diff --git a/meta b/meta
index 4c85911f745e3113628df46191a25228c63d9cbd..96e8ea70de7c615255f125f050124831d859ffe7 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: f65d4d6c6c1ffa57b051bd1b9952029236f47dc3
-Head: 5854d2c13510925478fbe4c70a86ef803bf0a149
+Previous: b882abb7195f6fd864efa5dfff8c8d20949a86d6
+Head: 314cddd485a8175f72ae6bc681398451af3bd4d5
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
-  addrinfo-af-ib: db2252249eaafe3f972105eff26b4db71850b1b2
-  refresh-temp: 5854d2c13510925478fbe4c70a86ef803bf0a149
+  addrinfo-af-ib: 314cddd485a8175f72ae6bc681398451af3bd4d5
 Unapplied:
   addrtype: f403b6e0e391ff091cf4470746012022303a4fd2
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a

diff --git a/patches/addrinfo-af-ib b/patches/addrinfo-af-ib
index a69b2211af01c670b14bb6aadb0997c477c584a4..ee4d469ef05092ccb927f63a46fa17fbb073969b 100644 (file)
--- a/patches/addrinfo-af-ib
+++ b/patches/addrinfo-af-ib
@@ -1,5 +1,5 @@
 Bottom: 4e01eb8a1c0681cd7bcca9c1bf3502036b929d4b
-Top:    7413d85582079678a2245ca49e793f0cd8ad5bd2
+Top:    b41f5d11d3f72c1bbe451336c858f7ebfb0a4da7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-28 12:33:04 -0700
 
@@ -19,17 +19,6 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 94fc4cd..ba4fc72 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005-2006,2011 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2005-2006,2011-2012 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
 diff --git a/include/rdma/rdma_cma.h b/include/rdma/rdma_cma.h
 index f3c8921..07fc747 100755
 --- a/include/rdma/rdma_cma.h

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index a076d7c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: 7413d85582079678a2245ca49e793f0cd8ad5bd2
-Top:    b41f5d11d3f72c1bbe451336c858f7ebfb0a4da7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-31 10:19:36 -0700
-
-Refresh of addrinfo-af-ib
-
----
-
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index ba4fc72..94fc4cd 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005-2006,2011-2012 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2005-2006,2011 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU