From 3fac5445dad6717c8d5f397a83730f146d24dcd0 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 27 Jun 2013 13:24:20 -0700
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |  5 +++--
 patches/refresh-temp | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index faedb2d..04f29ab 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: dad2e61d24e8e81a6749c07987ef90010db87274
-Head: fb07c48416a57c29a115ea6839faed3b13b7a5a1
+Previous: 6aae66bfc5c2b4a3e85d8f4e66171f4a62c203f3
+Head: 24b6c08b3e1a4e571334188b6097caf8fd7e1893
 Applied:
   0001-acm_notes.txt-Change-DOS-formatting-to-unix-formatti.patch: fb07c48416a57c29a115ea6839faed3b13b7a5a1
+  refresh-temp: 24b6c08b3e1a4e571334188b6097caf8fd7e1893
 Unapplied:
   0002-ibacm_opts.cfg-Fix-commentary-typo.patch: 3f15466b9279248d02e6accecc9e4a662c47179d
   0004-ibacm-.cfg-Change-DOS-formatting-to-unix-formatting.patch: 74f88487073e6259b72e8c491b3e71ccb6880a0b
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..c53c5d2
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,39 @@
+Bottom: bccc4f12eb6e2ae68bc3aa02df758c2032e74c6d
+Top:    53188195ee64d3a64c468b69ef9c1530300fad22
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-06-27 13:24:19 -0700
+
+Refresh of 0001-acm_notes.txt-Change-DOS-formatting-to-unix-formatti.patch
+
+---
+
+diff --git a/acm_notes.txt b/acm_notes.txt
+index fd8a3f4..e378799 100644
+--- 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
-- 
2.46.0