refresh (create temporary patch)

diff --git a/meta b/meta
index 1c33fb102d0bade80c36aab76db54b36a5cc3c0d..a01dbd02706a3976e1fb14356c79f995f2662034 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8c42bf352d4d90afab454d1844552fa94189fe44
-Head: 0c6ea8461d3d03ee2ef657eca0cd08965badf389
+Previous: c9b8b075f90f4e7a23ce28510473712c55310323
+Head: 764e4a8a10a5af9b6f55f0f88081740a774da457
 Applied:
   locking: 49fcc60d268ba85ee40dc4a4e7d3a4faac3abe9b
   verbose: ab647a30aa155e72a51f9e7e228d558b8db6ec2a
@@ -15,6 +15,7 @@ Applied:
   notes_man: 3d3b9ac02e0a3d11746b3ca601d4d73d918b411f
   def_log: f43faea8e7780d67919ebc6c1a435bcf3903e947
   rm_acm_msg: 0c6ea8461d3d03ee2ef657eca0cd08965badf389
+  refresh-temp: 764e4a8a10a5af9b6f55f0f88081740a774da457
 Unapplied:
   1.0.4: d587d496a0d6a0a997b2f09345dd483ae1d9a5a8
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b56d51b
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,65 @@
+Bottom: 73282e0f0d61bd4c4fc726f5436d4d479aa5ac42
+Top:    5367b34c78eebaff36d0f9720dcc10bd2f69ff4f
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-12-09 08:51:30 -0800
+
+Refresh of rm_acm_msg
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index dfe955e..503ad72 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,7 +18,7 @@ man_MANS = \
+       man/ib_acm.1 \
+       man/ib_acm.7
+ 
+-EXTRA_DIST = include/infiniband/acm.h src/acm_mad.h src/acm_msg.h src/libacm.h \
++EXTRA_DIST = src/acm_mad.h src/libacm.h \
+            linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS) acm_opts.cfg \
+            acm_addr.cfg
+ 
+diff --git a/src/acm_msg.h b/src/acm_msg.h
+deleted file mode 100644
+index 5d9a3a0..0000000
+--- a/src/acm_msg.h
++++ /dev/null
+@@ -1,37 +0,0 @@
+-/*\r
+- * Copyright (c) 2009 Intel Corporation.  All rights reserved.\r
+- *\r
+- * This software is available to you under the OpenFabrics.org BSD license\r
+- * below:\r
+- *\r
+- *     Redistribution and use in source and binary forms, with or\r
+- *     without modification, are permitted provided that the following\r
+- *     conditions are met:\r
+- *\r
+- *      - Redistributions of source code must retain the above\r
+- *        copyright notice, this list of conditions and the following\r
+- *        disclaimer.\r
+- *\r
+- *      - Redistributions in binary form must reproduce the above\r
+- *        copyright notice, this list of conditions and the following\r
+- *        disclaimer in the documentation and/or other materials\r
+- *        provided with the distribution.\r
+- *\r
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV\r
+- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+- * SOFTWARE.\r
+- */\r
+-\r
+-#if !defined(ACM_MSG_H)\r
+-#define ACM_MSG_H\r
+-\r
+-#include <infiniband\verbs.h>\r
+-\r
+-#define ACM_QKEY 0x80010000\r
+-\r
+-#endif /* ACM_MSG_H */