From b8d4aff250bf9b4d6d7b19a766d895a0988a3fe1 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Mon, 27 Aug 2012 16:34:38 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++---
 patches/refresh-temp | 56 --------------------------------------------
 patches/stder        | 50 +++++++++++++++++++++++++++++++++++++--
 3 files changed, 51 insertions(+), 62 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 778faa86..d831ca3b 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 500e3db1d698e76fd2de238f4dbd5a6d8853035c
-Head: 3fbd38e47835e7a17b9883a2a006a698601b25dd
+Previous: c678d3ce9f3ad70b9fc0e7d5ac3c633778dd2230
+Head: 991c701f81cab5a1860ac7774f654edfef956068
 Applied:
-  stder: 81af782c86c914de45327f6b6e8fde6fe42970ea
-  refresh-temp: 3fbd38e47835e7a17b9883a2a006a698601b25dd
+  stder: 991c701f81cab5a1860ac7774f654edfef956068
 Unapplied:
   sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
   af_ib: d6ca81dc1b7923005309b04c3bb684da0361cbc9
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 04654d16..00000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: f28ec49823485e069c95d7c5851dbd01583cf091
-Top:    57d7314fff3682c73b462fc63ad5d1b91784f59a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-27 16:34:38 -0700
-
-Refresh of stder
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index 5280620..ddd81d1 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -226,13 +226,13 @@ int ucma_init(void)
- 
- 	dev_list = ibv_get_device_list(&dev_cnt);
- 	if (!dev_list) {
--		printf("CMA: unable to get RDMA device list\n");
-+		fprintf(stderr, "CMA: unable to get RDMA device list\n");
- 		ret = ERR(ENODEV);
- 		goto err1;
- 	}
- 
- 	if (!dev_cnt) {
--		printf("CMA: no RDMA devices found\n");
-+		fprintf(stderr, "CMA: no RDMA devices found\n");
- 		ret = ERR(ENODEV);
- 		goto err2;
- 	}
-@@ -249,7 +249,7 @@ int ucma_init(void)
- 		cma_dev->guid = ibv_get_device_guid(dev_list[i]);
- 		cma_dev->verbs = ibv_open_device(dev_list[i]);
- 		if (!cma_dev->verbs) {
--			printf("CMA: unable to open RDMA device\n");
-+			fprintf(stderr, "CMA: unable to open RDMA device\n");
- 			ret = ERR(ENODEV);
- 			goto err3;
- 		}
-@@ -257,7 +257,7 @@ int ucma_init(void)
- 		i++;
- 		ret = ibv_query_device(cma_dev->verbs, &attr);
- 		if (ret) {
--			printf("CMA: unable to query RDMA device\n");
-+			fprintf(stderr, "CMA: unable to query RDMA device\n");
- 			ret = ERR(ret);
- 			goto err3;
- 		}
-@@ -329,7 +329,7 @@ struct rdma_event_channel *rdma_create_event_channel(void)
- 
- 	channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR);
- 	if (channel->fd < 0) {
--		printf("CMA: unable to open /dev/infiniband/rdma_cm\n");
-+		fprintf(stderr, "CMA: unable to open /dev/infiniband/rdma_cm\n");
- 		goto err;
- 	}
- 	return channel;
diff --git a/patches/stder b/patches/stder
index bd2f2fa1..bf347451 100644
--- a/patches/stder
+++ b/patches/stder
@@ -1,5 +1,5 @@
 Bottom: f28ec49823485e069c95d7c5851dbd01583cf091
-Top:    f28ec49823485e069c95d7c5851dbd01583cf091
+Top:    57d7314fff3682c73b462fc63ad5d1b91784f59a
 Author: Yann Droneaud <ydroneaud@opteya.com>
 Date:   2012-08-27 16:33:50 -0700
 
@@ -11,4 +11,50 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index 5280620..ddd81d1 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -226,13 +226,13 @@ int ucma_init(void)
+ 
+ 	dev_list = ibv_get_device_list(&dev_cnt);
+ 	if (!dev_list) {
+-		printf("CMA: unable to get RDMA device list\n");
++		fprintf(stderr, "CMA: unable to get RDMA device list\n");
+ 		ret = ERR(ENODEV);
+ 		goto err1;
+ 	}
+ 
+ 	if (!dev_cnt) {
+-		printf("CMA: no RDMA devices found\n");
++		fprintf(stderr, "CMA: no RDMA devices found\n");
+ 		ret = ERR(ENODEV);
+ 		goto err2;
+ 	}
+@@ -249,7 +249,7 @@ int ucma_init(void)
+ 		cma_dev->guid = ibv_get_device_guid(dev_list[i]);
+ 		cma_dev->verbs = ibv_open_device(dev_list[i]);
+ 		if (!cma_dev->verbs) {
+-			printf("CMA: unable to open RDMA device\n");
++			fprintf(stderr, "CMA: unable to open RDMA device\n");
+ 			ret = ERR(ENODEV);
+ 			goto err3;
+ 		}
+@@ -257,7 +257,7 @@ int ucma_init(void)
+ 		i++;
+ 		ret = ibv_query_device(cma_dev->verbs, &attr);
+ 		if (ret) {
+-			printf("CMA: unable to query RDMA device\n");
++			fprintf(stderr, "CMA: unable to query RDMA device\n");
+ 			ret = ERR(ret);
+ 			goto err3;
+ 		}
+@@ -329,7 +329,7 @@ struct rdma_event_channel *rdma_create_event_channel(void)
+ 
+ 	channel->fd = open("/dev/infiniband/rdma_cm", O_RDWR);
+ 	if (channel->fd < 0) {
+-		printf("CMA: unable to open /dev/infiniband/rdma_cm\n");
++		fprintf(stderr, "CMA: unable to open /dev/infiniband/rdma_cm\n");
+ 		goto err;
+ 	}
+ 	return channel;
-- 
2.46.0