From 2c3c6394d0ac67b66146def8b2af2fc09cbfac13 Mon Sep 17 00:00:00 2001 From: "sean.hefty@intel.com" Date: Tue, 3 Apr 2012 17:20:36 -0700 Subject: [PATCH] squash --- meta | 7 +++---- patches/{refresh-temp => mc-refcnt} | 10 ++++++++-- patches/mc_dest_refcnt | 17 ----------------- 3 files changed, 11 insertions(+), 23 deletions(-) rename patches/{refresh-temp => mc-refcnt} (62%) delete mode 100644 patches/mc_dest_refcnt diff --git a/meta b/meta index 6cbdc41..934b093 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 3df68af47162e104f0e80f6415798435a169db0c -Head: fb4600fea3faf2a8a2207a0233aa8ec46196db88 +Previous: 399ff6fab44444d7bdc1c664d8122e7f84e5dbaa +Head: 4f23053ab33fa519a16374f0b9273ca04798b56a Applied: - mc_dest_refcnt: a3ad57a67a619f535c54bf3552ee720eed29d4dd - refresh-temp: fb4600fea3faf2a8a2207a0233aa8ec46196db88 + mc-refcnt: 4f23053ab33fa519a16374f0b9273ca04798b56a Unapplied: af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c daemonize: fa67959cf1b176ad53b6feaa446cf284c37bd87c diff --git a/patches/refresh-temp b/patches/mc-refcnt similarity index 62% rename from patches/refresh-temp rename to patches/mc-refcnt index 23548d5..ca9c6a5 100644 --- a/patches/refresh-temp +++ b/patches/mc-refcnt @@ -1,9 +1,15 @@ Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317 Top: e36db38fed50062ef294584f071684b8cb1093fb Author: sean.hefty@intel.com -Date: 2012-04-03 17:04:24 -0700 +Date: 2012-04-03 17:20:35 -0700 -Refresh of mc_dest_refcnt +Fix refcnt for multicast destination + +mc_dest has a default refcnt of 0. When a multicast destination is +released, an attempt is made to free it, which can result in the +ibacm service crashing. + +Signed-off-by: Sean Hefty --- diff --git a/patches/mc_dest_refcnt b/patches/mc_dest_refcnt deleted file mode 100644 index 2b911fc..0000000 --- a/patches/mc_dest_refcnt +++ /dev/null @@ -1,17 +0,0 @@ -Bottom: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317 -Top: b0bae9f13e357fe01c3e0e890cc06e7fe5b01317 -Author: sean.hefty@intel.com -Date: 2012-04-03 16:59:31 -0700 - -Fix refcnt for multicast destination - -mc_dest has a default refcnt of 0. When a multicast destination is -released, an attempt is made to free it, which can result in the -ibacm service crashing. - -Signed-off-by: Sean Hefty - - ---- - - -- 2.46.0