From a9195ee6d240dc743a6694577a9bcb07959e9ac0 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 12 Aug 2013 10:13:28 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/ibacm-5-8-acm-c-make-sure-mgid | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index fb04958..f767b3c 100644 --- a/meta +++ b/meta @@ -1,13 +1,13 @@ Version: 1 -Previous: 768090a312e1d60f5915ad3d6cdf5e346596ce3f -Head: 1134a6ffad36c25adec24e877f1601bec219731a +Previous: c1685366c1ee43af287949e9c8a284d86c491381 +Head: 1fd3fb5fbef51e06879ddf55d414311ae7f1bbf0 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-: 1134a6ffad36c25adec24e877f1601bec219731a + ibacm-5-8-acm-c-make-sure-mgid: 1fd3fb5fbef51e06879ddf55d414311ae7f1bbf0 Unapplied: - 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 ibacm-8-8-acm-c-in-acm_join_gr: 51ab7d96846302e7b3d8f4d03b5deb1c4168389e diff --git a/patches/ibacm-5-8-acm-c-make-sure-mgid b/patches/ibacm-5-8-acm-c-make-sure-mgid index 529f471..a851bcf 100644 --- a/patches/ibacm-5-8-acm-c-make-sure-mgid +++ b/patches/ibacm-5-8-acm-c-make-sure-mgid @@ -1,5 +1,5 @@ -Bottom: 2ebdd14a3fe6a7df52667800ea42a9c450a9c30e -Top: a4539852085ea0eabd0e5088f8d7705e04e7fc0d +Bottom: 4df6bee9529676281cca8d198642f9ef351b2ee6 +Top: 4add6013b0f40f87144fed14ece4653ea3528d08 Author: Hal Rosenstock Date: 2013-08-06 07:45:31 -0400 @@ -13,10 +13,10 @@ Signed-off-by: Hal Rosenstock --- diff --git a/src/acm.c b/src/acm.c -index 8a5834f..edaab92 100644 +index bc59e5c..f7fa34f 100644 --- a/src/acm.c +++ b/src/acm.c -@@ -1493,7 +1493,7 @@ static void acm_init_join(struct ib_sa_mad *mad, union ibv_gid *port_gid, +@@ -1492,7 +1492,7 @@ static void acm_init_join(struct ib_sa_mad *mad, union ibv_gid *port_gid, IB_COMP_MASK_MC_SCOPE | IB_COMP_MASK_MC_JOIN_STATE; mc_rec = (struct ib_mc_member_rec *) mad->data; -- 2.46.0