refresh

diff --git a/meta b/meta
index 01775211b73036c233784d907b81029c11c23252..b2ddd42aad326649551481005efd86974aece735 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 93e2a605fe946ac6c827d0be95d0dfa813ad961d
-Head: 87f39aa528aa1813f7e1516267acf4c5a776469f
+Previous: cd96cb3cca8f6f8d670be3ab36d445532e8018e5
+Head: d28254ead37239006f77e14d30ddbd3ac1b7477a
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
-  loop: c72e512dccb1797ac88a704a2e50771c5dfa54d3
-  refresh-temp: 87f39aa528aa1813f7e1516267acf4c5a776469f
+  loop: d28254ead37239006f77e14d30ddbd3ac1b7477a
 Unapplied:
 Hidden:

diff --git a/patches/loop b/patches/loop
index 97cf063031d931b53b6ebfd6977db3cfed556696..25fa965af5934cc556083815e200b4272bf705b1 100644 (file)
--- a/patches/loop
+++ b/patches/loop
@@ -3,17 +3,17 @@ Top:    1e1d3e8a52d8f13c674a437c666499f303e34507
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-16 10:39:24 -0800
 
-ibacm: check for special handling of loopback requests
+ibacm: Introduce loopback resolution 'protocol'
 
 OFED 1.5.2 introduced a kernel patch that disables looping
 back multicast messages to the sending QP.  This capability
 was enabled by default.  The current ACM address resolution
 protocol depends on this feature of multicast.  To handle
-the case where multicast loopback has been disabled, modify
-ACM to check for this setting (which is controlled via a
-module parameter) and adjust its behavior accordingly.
+the case where multicast loopback has been disabled, add an
+option to ACM to resolve loopback addresses using local data
+only.  This option is enabled by default.
 
-If the module parameter is set, ACM will automatically
+When loopback resolution is set to 'local', ACM will automatically
 insert a loopback destination into each endpoint.  Requests
 to resolve a loopback address will find this destination
 and use it to respond to client requests.

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 80fd5d3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 1e1d3e8a52d8f13c674a437c666499f303e34507
-Top:    1e1d3e8a52d8f13c674a437c666499f303e34507
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-17 10:21:29 -0800
-
-Refresh of loop
-
----
-
-