refresh (create temporary patch)

diff --git a/meta b/meta
index a582ae0d47e7d1076c5d538b605f5a1dab38f54e..0eb5a05cc6119c01e337059a40ac8f51804e3565 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 4729b8c86ce2290ce32cc7276d672cdb7e41a14c
-Head: 1fc91992f8969c0f6d47cb432e0944f21a15e520
+Previous: f04368837f5bc74dad0385850aa97e84bb93eb1b
+Head: 3bb02e56227a900d7c3ee5ad409e3f43a031e0ac
 Applied:
   addrtype: c8173d50d1a8c2bbfb0c4459e05d3941175676b2
   acm_msg: cdb7d0ffecc1a7beba285762d08edef37beddd1b
   use-acm: 1fc91992f8969c0f6d47cb432e0944f21a15e520
+  refresh-temp: 3bb02e56227a900d7c3ee5ad409e3f43a031e0ac
 Unapplied:
   old-af-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   rs-setroute: 372986c005605c497bebd250b2d8e2bfe9608315

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..8197f73
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,47 @@
+Bottom: 6be22fb12cd012007970e989a47c996ed8d0a55d
+Top:    4389e5ccd819a6d0803f1527aeca1074994ff4ce
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-07-18 10:47:33 -0700
+
+Refresh of use-acm
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 09c5d4e..04cddee 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -45,7 +45,6 @@
+ #include <infiniband/ib.h>
+ #include <infiniband/sa.h>
+ 
+-#ifdef USE_IB_ACM
+ #define ACM_VERSION             1
+ 
+ #define ACM_OP_RESOLVE          0x01
+@@ -453,5 +452,3 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       if (af_ib_support && !(hints->ai_flags & RAI_ROUTEONLY) && (*rai)->ai_route_len)
+               ucma_resolve_af_ib(rai);
+ }
+-
+-#endif /* USE_IB_ACM */
+diff --git a/src/cma.h b/src/cma.h
+index b575b9b..e6fba8b 100644
+--- a/src/cma.h
++++ b/src/cma.h
+@@ -162,15 +162,9 @@ extern int af_ib_support;
+ 
+ #define RAI_ROUTEONLY         0x01000000
+ 
+-#ifdef USE_IB_ACM
+ void ucma_ib_init();
+ void ucma_ib_cleanup();
+ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
+-#else
+-#define ucma_ib_init()
+-#define ucma_ib_cleanup()
+-#define ucma_ib_resolve(x, y)
+-#endif
+ 
+ /* Define path record definition if using older version of libibverbs */
+ #ifdef DEFINE_PATH_RECORD