Refresh of 0001-acm_notes.txt-Change-DOS-formatting-to-unix-formatti.patch

diff --git a/acm_notes.txt b/acm_notes.txt
index fd8a3f4ddcc342f1cef232303a48cb62c1c1ff06..e37879923482e03754a70fe23ad9ffba2eb5e82b 100644 (file)
--- a/acm_notes.txt
+++ b/acm_notes.txt
@@ -73,7 +73,11 @@ The acm_opts.cfg file provides a set of configurable options for the
 ib_acm service, such as timeout, number of retries, logging level, etc.
 ib_acme generates the acm_opts.cfg file using static information.  A
 future enhancement would adjust options based on the current system
+<<<<<<< current
 and cluster size.
+=======
+and cluster size. 
+>>>>>>> patched
 
 
 ib_acm:
@@ -128,6 +132,7 @@ The current implementation of the IB ACM has several additional restrictions:
   limited to 4.
 - The number of multicast groups that an endpoint can support is limited to 2.
 
+<<<<<<< current
 The ibacm contains several internal caches.  These include  caches  for
 GID  and  LID  destination  addresses.   These caches can be optionally
 preloaded. ibacm supports the OpenSM dump_pr plugin  "full"  PathRecord
@@ -141,3 +146,5 @@ OpenSM to generate this file.
 Additional IPv4 and IPv6 caches can be be preloaded by using the
 hosts_file option.  The default is "none" which does not preload these
 caches.
+=======
+>>>>>>> patched