refresh

diff --git a/meta b/meta
index 26e72500e580f7c6b1c102e71a7ae532588b5262..4282351d3f5fb3979f23f9816a81ded77022e4d4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: a8bce3cd64905b80cc6fea9a8fa005a90b8ae894
-Head: 9496e2afde6a49af0f6ff0c0d5cec00556595443
+Previous: 084a009922534fc5c6d5a64a9069f6faca6c7f60
+Head: fe72d7d77e6ad28adff648efd807c41dc4c5f9c9
 Applied:
-  notes: ed464c5654075ec53e6b337974c7b609f56e33aa
-  refresh-temp: 9496e2afde6a49af0f6ff0c0d5cec00556595443
+  notes: fe72d7d77e6ad28adff648efd807c41dc4c5f9c9
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/notes b/patches/notes
index 953b57e87560acf58161cd44e7481cc079875923..d562ced215ea99081db5654d1314d3e287ceeca3 100644 (file)
--- a/patches/notes
+++ b/patches/notes
@@ -1,5 +1,5 @@
 Bottom: 001b42302de2ad96048ae1ad5c4d3ea6bb152e62
-Top:    001b42302de2ad96048ae1ad5c4d3ea6bb152e62
+Top:    af83bf966d67892a75ec2686b099da14c206b9f4
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2013-05-09 07:55:53 -0700
 
@@ -10,4 +10,15 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_notes.txt b/acm_notes.txt
+index 4d20e71..ed519ab 100644
+--- a/acm_notes.txt
++++ b/acm_notes.txt
+@@ -46,7 +46,7 @@ Quick Start Guide
+    interfaces, it should be run with administrative privileges.\r
+ 5. Optionally, run ib_acme -s <source_ip> -d <dest_ip> -v\r
+    This will verify that the ib_acm service is running.\r
+-5. Install librdmacm using the build option --with-ib_acm.\r
++5. Install librdmacm.\r
+    The librdmacm will automatically use the ib_acm service.\r
+    On failures, the librdmacm will fall back to normal resolution.

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1072303..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 001b42302de2ad96048ae1ad5c4d3ea6bb152e62
-Top:    af83bf966d67892a75ec2686b099da14c206b9f4
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2013-05-09 07:56:27 -0700
-
-Refresh of notes
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index 4d20e71..ed519ab 100644
---- a/acm_notes.txt
-+++ b/acm_notes.txt
-@@ -46,7 +46,7 @@ Quick Start Guide
-    interfaces, it should be run with administrative privileges.\r
- 5. Optionally, run ib_acme -s <source_ip> -d <dest_ip> -v\r
-    This will verify that the ib_acm service is running.\r
--5. Install librdmacm using the build option --with-ib_acm.\r
-+5. Install librdmacm.\r
-    The librdmacm will automatically use the ib_acm service.\r
-    On failures, the librdmacm will fall back to normal resolution.