From 34e56afd3a1642c2caf58f5b366e75e7cb865ce8 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 29 Aug 2012 15:59:29 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/addrtype     | 13 +++++++++++--
 patches/refresh-temp | 22 ----------------------
 3 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 17ed9667..e649bf1f 100644
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: b6d584daa9683e65f11f05bb988f044c7995b97d
-Head: bd74b6f760a319a22059d3040ce8b57156679b3c
+Previous: 77817a864dd9c2effe03e6d91cfc6112e47b87d9
+Head: dd53d1f64d9b219a872c151d3ecfaa3f2eeb252c
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: f98ce7c3d4d19bb1a3fab5d0adbe97fd6a84e805
-  addrtype: cee2f347b27737ecd83d98e22c581c6bbd608e96
-  refresh-temp: bd74b6f760a319a22059d3040ce8b57156679b3c
+  addrtype: dd53d1f64d9b219a872c151d3ecfaa3f2eeb252c
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a
diff --git a/patches/addrtype b/patches/addrtype
index 5aea2707..105da29a 100644
--- a/patches/addrtype
+++ b/patches/addrtype
@@ -1,5 +1,5 @@
 Bottom: 4ce62c6180a5ad6e3d7080ab386b955959166fc1
-Top:    37d2010ca6d23762f290e35d6a3474ff9d72123b
+Top:    32b2fc95f4b63e10ed407576f1c52d33d49f3f5b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-29 15:02:54 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 94fc4cd..8d11f33 100644
+index 94fc4cd..ec3a4ce 100644
 --- a/examples/cmatose.c
 +++ b/examples/cmatose.c
 @@ -1,5 +1,5 @@
@@ -65,6 +65,15 @@ index 94fc4cd..8d11f33 100644
  	ret = get_rdma_addr(src_addr, dst_addr, port, &hints, &test.rai);
  	if (ret) {
  		perror("cmatose: getaddrinfo error");
+@@ -646,7 +640,7 @@ int main(int argc, char **argv)
+ {
+ 	int op, ret;
+ 
+-	while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:m")) != -1) {
++	while ((op = getopt(argc, argv, "s:b:f:c:C:S:t:p:m")) != -1) {
+ 		switch (op) {
+ 		case 's':
+ 			dst_addr = optarg;
 @@ -654,6 +648,16 @@ int main(int argc, char **argv)
  		case 'b':
  			src_addr = optarg;
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 03306945..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 37d2010ca6d23762f290e35d6a3474ff9d72123b
-Top:    32b2fc95f4b63e10ed407576f1c52d33d49f3f5b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-29 15:59:29 -0700
-
-Refresh of addrtype
-
----
-
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 8d11f33..ec3a4ce 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -640,7 +640,7 @@ int main(int argc, char **argv)
- {
- 	int op, ret;
- 
--	while ((op = getopt(argc, argv, "s:b:c:C:S:t:p:m")) != -1) {
-+	while ((op = getopt(argc, argv, "s:b:f:c:C:S:t:p:m")) != -1) {
- 		switch (op) {
- 		case 's':
- 			dst_addr = optarg;
-- 
2.46.0