refresh

diff --git a/meta b/meta
index 6482dd058299b89b910c905b29e75605dae5bbed..00faaadded9f0bedac9e62345d35efa2f726a8ea 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: bbb4fd31e33d1f1b4daf9050f73a3b7b348932c1
-Head: 802bdd740a7cf76e8ef381a4dd1b677074878df8
+Previous: ba5bd473e60021ecfffdd03cef724bc47bc8fb05
+Head: b222226996fcdc7452b199b5ca4e09894adbc4ac
 Applied:
-  notes: a7e0185569691d8ceaefd9e10d9a939efb4054db
-  refresh-temp: 802bdd740a7cf76e8ef381a4dd1b677074878df8
+  notes: b222226996fcdc7452b199b5ca4e09894adbc4ac
 Unapplied:
 Hidden:

diff --git a/patches/notes b/patches/notes
index fc4d9f5f9e6976440a7f4bf9e7f3bb3ded05941d..651ac2b5c091288bc7af15024c74a63420daf5e0 100644 (file)
--- a/patches/notes
+++ b/patches/notes
@@ -1,5 +1,5 @@
 Bottom: 08787f954160387a7e64941d7eb9f8d46cc57966
-Top:    40ad6411b2dade22b07ae91785cc9c8f11f32df8
+Top:    087d6d362bd4701b1c1d2e3b02fbb873888cbf80
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-06-08 11:27:37 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/acm_notes.txt b/acm_notes.txt
-index 142d4d9..c7dc56a 100644
+index 142d4d9..bf38961 100644
 --- a/acm_notes.txt
 +++ b/acm_notes.txt
 @@ -5,59 +5,126 @@ Note: The IB ACM should be considered experimental.
@@ -131,7 +131,7 @@ index 142d4d9..c7dc56a 100644
 +provides an experimental multicast resolution protocol in hope of\r
 +achieving greater scalability.  The latter is not usable on all fabric\r
 +topologies, specifically ones that may not have reversible paths.\r
-+Users should use the ib_acme utilty to verify that multicast protocol\r
++Users should use the ib_acme utility to verify that multicast protocol\r
 +is usable before running other applications.\r
 +\r
 +Conceptually, the ib_acm service implements an ARP like protocol and either\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5d33ea5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 40ad6411b2dade22b07ae91785cc9c8f11f32df8
-Top:    087d6d362bd4701b1c1d2e3b02fbb873888cbf80
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-06-08 11:59:32 -0700
-
-Refresh of notes
-
----
-
-diff --git a/acm_notes.txt b/acm_notes.txt
-index c7dc56a..bf38961 100644
---- a/acm_notes.txt
-+++ b/acm_notes.txt
-@@ -89,7 +89,7 @@ ib_acm supports standard SA path record queries on the back-end, it
- provides an experimental multicast resolution protocol in hope of\r
- achieving greater scalability.  The latter is not usable on all fabric\r
- topologies, specifically ones that may not have reversible paths.\r
--Users should use the ib_acme utilty to verify that multicast protocol\r
-+Users should use the ib_acme utility to verify that multicast protocol\r
- is usable before running other applications.\r
- \r
- Conceptually, the ib_acm service implements an ARP like protocol and either