refresh

diff --git a/meta b/meta
index 12e9145fd703ebf94e114ccc5c6c414a4bd63a98..5cfba56d6a30cdf47143e6619ec925578c4b7941 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 446f31873969bf71d2911e75d01ab7166ae199bc
-Head: 3192f20792357b172d3fcb5d9c8c0ff7e2297abb
+Previous: 4bf29405d640174ebe204adfce9400f31aa46412
+Head: 7f17ffc87301d39567af873e9aeb5e361bbcf2a7
 Applied:
   stder: 991c701f81cab5a1860ac7774f654edfef956068
-  pfx: 09e0056823d9d6a1ee672e67241ff1f57b71d853
-  refresh-temp: 3192f20792357b172d3fcb5d9c8c0ff7e2297abb
+  pfx: 7f17ffc87301d39567af873e9aeb5e361bbcf2a7
 Unapplied:
   sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
   af_ib: d6ca81dc1b7923005309b04c3bb684da0361cbc9

diff --git a/patches/pfx b/patches/pfx
index 3f86b6a475db8096f445621dcb95fcb4a1322a8f..0b545068e51234231998fef9ef5b43dddb44990f 100644 (file)
--- a/patches/pfx
+++ b/patches/pfx
@@ -1,5 +1,5 @@
 Bottom: 57d7314fff3682c73b462fc63ad5d1b91784f59a
-Top:    57d7314fff3682c73b462fc63ad5d1b91784f59a
+Top:    8ecca87db88331d6078a80c3fd9825bc2059cd28
 Author: Yann Droneaud <ydroneaud@opteya.com>
 Date:   2012-08-27 16:35:32 -0700
 
@@ -11,4 +11,69 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/src/cma.c b/src/cma.c
+index ddd81d1..7002513 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -158,15 +158,15 @@ static int check_abi_version(void)
+                * backports, assume the most recent version of the ABI.  If
+                * we're wrong, we'll simply fail later when calling the ABI.
+                */
+-              fprintf(stderr, "librdmacm: couldn't read ABI version.\n");
+-              fprintf(stderr, "librdmacm: assuming: %d\n", abi_ver);
++              fprintf(stderr, PFX "couldn't read ABI version.\n");
++              fprintf(stderr, PFX "assuming: %d\n", abi_ver);
+               return 0;
+       }
+ 
+       abi_ver = strtol(value, NULL, 10);
+       if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
+           abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
+-              fprintf(stderr, "librdmacm: kernel ABI version %d "
++              fprintf(stderr, PFX "kernel ABI version %d "
+                               "doesn't match library version %d.\n",
+                               abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
+               return -1;
+@@ -226,13 +226,13 @@ int ucma_init(void)
+ 
+       dev_list = ibv_get_device_list(&dev_cnt);
+       if (!dev_list) {
+-              fprintf(stderr, "CMA: unable to get RDMA device list\n");
++              fprintf(stderr, PFX "unable to get RDMA device list\n");
+               ret = ERR(ENODEV);
+               goto err1;
+       }
+ 
+       if (!dev_cnt) {
+-              fprintf(stderr, "CMA: no RDMA devices found\n");
++              fprintf(stderr, PFX "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) {
+-                      fprintf(stderr, "CMA: unable to open RDMA device\n");
++                      fprintf(stderr, PFX "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) {
+-                      fprintf(stderr, "CMA: unable to query RDMA device\n");
++                      fprintf(stderr, PFX "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) {
+-              fprintf(stderr, "CMA: unable to open /dev/infiniband/rdma_cm\n");
++              fprintf(stderr, PFX "unable to open /dev/infiniband/rdma_cm\n");
+               goto err;
+       }
+       return channel;

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index bcdc414..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,75 +0,0 @@
-Bottom: 57d7314fff3682c73b462fc63ad5d1b91784f59a
-Top:    8ecca87db88331d6078a80c3fd9825bc2059cd28
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-27 16:35:59 -0700
-
-Refresh of pfx
-
----
-
-diff --git a/src/cma.c b/src/cma.c
-index ddd81d1..7002513 100755
---- a/src/cma.c
-+++ b/src/cma.c
-@@ -158,15 +158,15 @@ static int check_abi_version(void)
-                * backports, assume the most recent version of the ABI.  If
-                * we're wrong, we'll simply fail later when calling the ABI.
-                */
--              fprintf(stderr, "librdmacm: couldn't read ABI version.\n");
--              fprintf(stderr, "librdmacm: assuming: %d\n", abi_ver);
-+              fprintf(stderr, PFX "couldn't read ABI version.\n");
-+              fprintf(stderr, PFX "assuming: %d\n", abi_ver);
-               return 0;
-       }
- 
-       abi_ver = strtol(value, NULL, 10);
-       if (abi_ver < RDMA_USER_CM_MIN_ABI_VERSION ||
-           abi_ver > RDMA_USER_CM_MAX_ABI_VERSION) {
--              fprintf(stderr, "librdmacm: kernel ABI version %d "
-+              fprintf(stderr, PFX "kernel ABI version %d "
-                               "doesn't match library version %d.\n",
-                               abi_ver, RDMA_USER_CM_MAX_ABI_VERSION);
-               return -1;
-@@ -226,13 +226,13 @@ int ucma_init(void)
- 
-       dev_list = ibv_get_device_list(&dev_cnt);
-       if (!dev_list) {
--              fprintf(stderr, "CMA: unable to get RDMA device list\n");
-+              fprintf(stderr, PFX "unable to get RDMA device list\n");
-               ret = ERR(ENODEV);
-               goto err1;
-       }
- 
-       if (!dev_cnt) {
--              fprintf(stderr, "CMA: no RDMA devices found\n");
-+              fprintf(stderr, PFX "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) {
--                      fprintf(stderr, "CMA: unable to open RDMA device\n");
-+                      fprintf(stderr, PFX "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) {
--                      fprintf(stderr, "CMA: unable to query RDMA device\n");
-+                      fprintf(stderr, PFX "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) {
--              fprintf(stderr, "CMA: unable to open /dev/infiniband/rdma_cm\n");
-+              fprintf(stderr, PFX "unable to open /dev/infiniband/rdma_cm\n");
-               goto err;
-       }
-       return channel;