refresh

diff --git a/meta b/meta
index ba54e94a5d52e46242800e7774a37baeb8f371c3..f7775b6e475b289907e19913a7ff4e6a845373af 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3da7840b5dc93556905544489c952324f1a9c16d
-Head: b67025b516d09202f4286bea070b2dcd0380d1e0
+Previous: a5d400564855dc1cb30937b31047d77da4e4f7dd
+Head: 66840390c85647ba7eb462ca5f30b0e2cd898adb
 Applied:
-  join-err: 2aec0363499fb13b5677fc42fc03f7a51d431e95
-  refresh-temp: b67025b516d09202f4286bea070b2dcd0380d1e0
+  join-err: 66840390c85647ba7eb462ca5f30b0e2cd898adb
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/join-err b/patches/join-err
index 96967e0bfba9780eab8389835c7538947cb39ff8..71c4473fa4578053cb3c1bf5238127ff659023bb 100644 (file)
--- a/patches/join-err
+++ b/patches/join-err
@@ -6,7 +6,10 @@ Date:   2014-04-09 12:04:19 -0700
 ibacm: Fix invalid memory dereference in acm_process_join_resp
 
 If a join request fails, the dest pointer may not be initialized.
-This can result in the ibacm daemon crashing.
+This can result in the ibacm daemon crashing.  Fix the crash and
+ensure that the multicast state is set correctly in case the
+join fails by initializing the state to ACM_INIT before sending
+the join request.
 
 Problem reported by: Kaike Wan <kaike.wan@intel.com>
 

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8e81aea..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 17ef417062286b7467e6e5a52c09169cb23128d1
-Top:    17ef417062286b7467e6e5a52c09169cb23128d1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-04-13 14:45:50 -0700
-
-Refresh of join-err
-
----
-
-