refresh

diff --git a/meta b/meta
index dfacc2eb9916d2592cce16101c9cc890f1bc82fd..4cf3e82450b0fdb956e8cf6ec16fbc9747b24928 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 92874c2443d09cf36332c40e89f4c82b0aa86bff
-Head: c60496939903dd659fb0f16c5504180fe9d698db
+Previous: b175eb2dc3df87297f3d738dd646ea91cd391585
+Head: 7b1eb6407f1f7a953673ab23a2d75f8a3cd8dbb9
 Applied:
   rsocket-add-support-for-rdma_r: 7f0fbf984a5140efb76f93fef1f35202c617249d
-  librdmacm-trivial-cma-in-ucma_: 7a5cd86e46495635f76029679862e1017c664f79
-  refresh-temp: c60496939903dd659fb0f16c5504180fe9d698db
+  librdmacm-trivial-cma-in-ucma_: 7b1eb6407f1f7a953673ab23a2d75f8a3cd8dbb9
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/librdmacm-trivial-cma-in-ucma_ b/patches/librdmacm-trivial-cma-in-ucma_
index 679d4c0d09ce10d241f20f7ae944091fc7efb276..9f45e7720857c7902f708ebd59d6a2d4a7ba5eb9 100644 (file)
--- a/patches/librdmacm-trivial-cma-in-ucma_
+++ b/patches/librdmacm-trivial-cma-in-ucma_
@@ -3,12 +3,13 @@ Top:    34e7fe6d90ff2e1271470ff705ad105d17a0e073
 Author: Hal Rosenstock <hal@dev.mellanox.co.il>
 Date:   2014-06-19 13:08:02 -0400
 
-[librdmacm,TRIVIAL] cma: In ucma_convert_path, fix selector values
+librdmacm: In ucma_convert_path, fix selector values
 
 Intent is for the selectors to be equal to (exactly) rather than less than.
 Selector for exactly is value of 2 rather than 1.
 
 Signed-off-by: Hal Rosenstock <hal@mellanox.com>
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index aa1042d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 34e7fe6d90ff2e1271470ff705ad105d17a0e073
-Top:    34e7fe6d90ff2e1271470ff705ad105d17a0e073
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-06-20 10:49:59 -0700
-
-Refresh of librdmacm-trivial-cma-in-ucma_
-
----
-
-