refresh (create temporary patch)

diff --git a/meta b/meta
index 09e8b62f2e018eb6f12b95b2dd4a5d9f92e0b67b..a1a25492e55185550f5fb861655d4a184d0fcb36 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: 98092aed80d4b7c6e1b131d582196545a1d8bc4e
-Head: be06867bebb902083cc5161e0a07c48f226aa621
+Previous: f0f37a9f1fd922a739dd05db701a77e48bf8fc01
+Head: af9c8db79cf2ffe121f437d3f3569947749f4b23
 Applied:
   sa_family: 85be179d2f63865dbf1f5adc1dc76c093c6b811e
   af_ib: be06867bebb902083cc5161e0a07c48f226aa621
+  refresh-temp: af9c8db79cf2ffe121f437d3f3569947749f4b23
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..eaa4abc
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,21 @@
+Bottom: f785cd6baadc37d4b07525ba84ef1cb4eb08b31a
+Top:    887d55d9c4229530cb6672292eccba87095a9e52
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-08-24 16:42:38 -0700
+
+Refresh of af_ib
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 7e7e8a7..92411fa 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -410,7 +410,7 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       ucma_ib_save_resp(*rai, &msg);
+ 
+       if (af_ib_support && !((*rai)->ai_flags & RAI_ROUTEONLY) &&
+-          (*rai)->ai_route_len)
++          (*rai)->ai_route_len && ((*rai)->ai_family != AF_IB))
+               ucma_resolve_af_ib(rai);
+ }