refresh

diff --git a/meta b/meta
index 150db7e74a781278a292306b733f493c875f2bfd..b92c0ca0e3c0ea81f684abbdb758a33d923efe0d 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: d2502adb424543ce896aaba7c9d4b575bd96daad
-Head: 4ae4814fd94dee435644c585ae10e0d48680a394
+Previous: c409e24aaa03bbdac1867c385f9a457536df6fcf
+Head: 9fb978ede0b7b548b7954f01097af337b938020c
 Applied:
   rs-shutdown: 110fcad2ecce39d6888448c19b08791ea193e7f9
   rs-maxseg: b99bd0638e7d22b1b0976a34a58efd352db420b3
-  rs-spin: fd753fb9e36b4ec5f5da3e0d2ee588297a172736
-  refresh-temp: 4ae4814fd94dee435644c585ae10e0d48680a394
+  rs-spin: 9fb978ede0b7b548b7954f01097af337b938020c
 Unapplied:
   rs-defaults: 5a39fae0e595b08ff2b5ca58896ee0ecd51ab66c
   ip6-opt: 7e43a759255e9890d1e41f1edf71792836f53941

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e0e4145..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: 9a355c4fd6adc489cc0c3c07b3d436d25ff2cb0c
-Top:    9a355c4fd6adc489cc0c3c07b3d436d25ff2cb0c
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-06 11:37:00 -0700
-
-Refresh of rs-spin
-
----
-
-

diff --git a/patches/rs-spin b/patches/rs-spin
index cd79937997c4d2ef58e079bd8617e9e730688037..7b4a40293895c725e55cc89e5b7be48aedccf356 100644 (file)
--- a/patches/rs-spin
+++ b/patches/rs-spin
@@ -11,7 +11,7 @@ into the kernel and blocking.
 
 The time to spin before blocking is read from an rsocket
 configuration file %sysconfig%/rdma/rsocket/polling_time.  This
-is user adjustable or may be set automatically by ibacm.
+is user adjustable.
 
 As a completely unintentional side effect, this just happens to
 improve application performance in benchmarks, like netpipe,