pop

diff --git a/meta b/meta
index 7f9fbef64cbde6cd59a45b1e132082b0b79a31e8..eb406718af7f95112855a83b6ddbed6c6b6140c8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: ca66fcf044704700b7735b022757b5fb0e7d88be
-Head: cfbbd75d81d68c8ccda6a0a2cf713cfdda49085c
+Previous: 3de2f5ce50cdc8b51a48a2e00e3937a2b5e0d78b
+Head: 3fd0109fccf99396c566505a835aac765c4607d5
 Applied:
   ibacm-1-8-libacm-c-remove-unne: b3c59c1c23c67bd83e8dd87e1bb29217dac40245
   ibacm-2-8-acm-c-in-acm_port_up: f7987f2ab2e98c37caeb75b1eb88c1368a5cb526
   ibacm-3-8-acm-c-invalid-pkey-h: cfbbd75d81d68c8ccda6a0a2cf713cfdda49085c
+  ibacm-4-8-acm-c-fix-endian-of-: 3fd0109fccf99396c566505a835aac765c4607d5
 Unapplied:
-  ibacm-4-8-acm-c-fix-endian-of-: 119d735a9d4f819ccb92bbcbc2124a5dc12791db
   ibacm-5-8-acm-c-make-sure-mgid: cb90c97741822a51080ef3bb22b8107a5054d706
   ibacm-6-8-acm-c-send-multicast: 3418d5907330277fd1e79a07b414b369701b3ccd
   ibacm-7-8-acm-c-fix-endian-of-: cc91bc73b1444cd06e25c9c43fd711b4b705a13f

diff --git a/patches/ibacm-4-8-acm-c-fix-endian-of- b/patches/ibacm-4-8-acm-c-fix-endian-of-
index ebabaefe666038f2b216ebf274b8a10b59a969c3..ae57fc4e532ae336d0d1609d6637cd1dbcc93f8a 100644 (file)
--- a/patches/ibacm-4-8-acm-c-fix-endian-of-
+++ b/patches/ibacm-4-8-acm-c-fix-endian-of-
@@ -1,5 +1,5 @@
-Bottom: e197b8d42eb6bae8e20ac9c923ae1e9f5635ea0c
-Top:    2ebdd14a3fe6a7df52667800ea42a9c450a9c30e
+Bottom: e233b34f0e9a137c7e0a76af5009b7ca79ef0c3f
+Top:    4df6bee9529676281cca8d198642f9ef351b2ee6
 Author: Hal Rosenstock <hal@dev.mellanox.co.il>
 Date:   2013-08-06 07:45:28 -0400
 
@@ -13,10 +13,10 @@ Signed-off-by: Hal Rosenstock <hal@mellanox.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index f7de23e..8a5834f 100644
+index 45ed133..bc59e5c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -839,7 +839,7 @@ static void acm_init_path_query(struct ib_sa_mad *mad)
+@@ -838,7 +838,7 @@ static void acm_init_path_query(struct ib_sa_mad *mad)
        mad->mgmt_class = IB_MGMT_CLASS_SA;
        mad->class_version = 2;
        mad->method = IB_METHOD_GET;
@@ -25,7 +25,7 @@ index f7de23e..8a5834f 100644
        mad->attr_id = IB_SA_ATTR_PATH_REC;
  }
  
-@@ -1483,7 +1483,7 @@ static void acm_init_join(struct ib_sa_mad *mad, union ibv_gid *port_gid,
+@@ -1482,7 +1482,7 @@ static void acm_init_join(struct ib_sa_mad *mad, union ibv_gid *port_gid,
        mad->mgmt_class = IB_MGMT_CLASS_SA;
        mad->class_version = 2;
        mad->method = IB_METHOD_SET;
@@ -34,7 +34,7 @@ index f7de23e..8a5834f 100644
        mad->attr_id = IB_SA_ATTR_MC_MEMBER_REC;
        mad->comp_mask =
                IB_COMP_MASK_MC_MGID | IB_COMP_MASK_MC_PORT_GID |
-@@ -1953,7 +1953,7 @@ acm_send_resolve(struct acm_ep *ep, struct acm_dest *dest,
+@@ -1952,7 +1952,7 @@ acm_send_resolve(struct acm_ep *ep, struct acm_dest *dest,
        mad->class_version = 1;
        mad->method = IB_METHOD_GET;
        mad->control = ACM_CTRL_RESOLVE;