pop

diff --git a/meta b/meta
index 934b0935037eba3a5627e4b736ad208864567181..2c0084cf26f6c2aa2cce7abe43f50d0a60f2010e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 399ff6fab44444d7bdc1c664d8122e7f84e5dbaa
-Head: 4f23053ab33fa519a16374f0b9273ca04798b56a
+Previous: ac679dce35b0ade05ebf328f0a75f2750cbff467
+Head: f14184051293bfceac4f04e46efcf2f329a42aff
 Applied:
   mc-refcnt: 4f23053ab33fa519a16374f0b9273ca04798b56a
+  af_ib: f14184051293bfceac4f04e46efcf2f329a42aff
 Unapplied:
-  af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   daemonize: fa67959cf1b176ad53b6feaa446cf284c37bd87c
   rel-1.0.6: 61af43c5cc2b40893ea9ff555020c137366773cd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/af_ib b/patches/af_ib
index 0a396784868bb4c5cf6cf4ce6db3babe058f16a1..c3ac1f78536081e779bdffa1f3851ddb93285d74 100644 (file)
--- a/patches/af_ib
+++ b/patches/af_ib
@@ -1,5 +1,5 @@
-Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317
-Top:    163f50499aea8749e94a5c93c4939e5f74ae1906
+Bottom: e36db38fed50062ef294584f071684b8cb1093fb
+Top:    e08db13f657dd29e1d20ddd6d5e6e9d8d4abbc75
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-10-03 12:40:16 -0700
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index d47f9d6..906c926 100644
+index cff9113..6089785 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -949,9 +949,13 @@ acm_record_path_addr(struct acm_ep *ep, struct acm_dest *dest,
+@@ -950,9 +950,13 @@ acm_record_path_addr(struct acm_ep *ep, struct acm_dest *dest,
  {
        acm_log(2, "%s\n", dest->name);
        dest->path.pkey = htons(ep->pkey);
@@ -34,7 +34,7 @@ index d47f9d6..906c926 100644
        dest->path.dlid = path->dlid;
        dest->state = ACM_ADDR_RESOLVED;
  }
-@@ -1745,10 +1749,29 @@ static void acm_svr_accept(void)
+@@ -1746,10 +1750,29 @@ static void acm_svr_accept(void)
  static int
  acm_is_path_from_port(struct acm_port *port, struct ibv_path_record *path)
  {