refresh

diff --git a/meta b/meta
index a1f6bd660caec6b9ed3c225669d25ca8ae466c12..3ef96eb643530cce3fd2565501b9ff0dd7d74fe6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: ea75e73a5735969d01c4059bc6e6b52437ea8fad
-Head: 27d80691afbdb7dd4fd19bfcd8eff9bb38cbd024
+Previous: 56d3282b7d3622aea2cbb532cb972bc08dd9a5bd
+Head: 612eae1f6fe3320a9a657b99b130a9dc6db53858
 Applied:
   1-2-rping-fixes-race-where-ibv: 5ae36aba6f9507324048d1d6d5536bed6f5fe92c
-  2-2-rping-ignore-flushed-compl: 621ca520c401ca26909a29cede7300ee4776354a
-  refresh-temp: 27d80691afbdb7dd4fd19bfcd8eff9bb38cbd024
+  2-2-rping-ignore-flushed-compl: 612eae1f6fe3320a9a657b99b130a9dc6db53858
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/2-2-rping-ignore-flushed-compl b/patches/2-2-rping-ignore-flushed-compl
index a19be329b511367f5a3f82f0edfe41458ef05228..d5535ba95e4e46829a5db8907ea69c6de705e1ac 100644 (file)
--- a/patches/2-2-rping-ignore-flushed-compl
+++ b/patches/2-2-rping-ignore-flushed-compl
@@ -3,11 +3,12 @@ Top:    e95f5275d89440ba116805743d8bef291d058c93
 Author: Hariprasad S <hariprasad@chelsio.com>
 Date:   2014-11-06 14:42:57 +0530
 
-[2/2] rping: ignore flushed completions
+rping: ignore flushed completions
 
 Based on original work by Steve Wise <steve@opengridcomputing.com>
 
 Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
+Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 
 ---

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2f6d696..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: e95f5275d89440ba116805743d8bef291d058c93
-Top:    e95f5275d89440ba116805743d8bef291d058c93
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-11-14 10:48:12 -0800
-
-Refresh of 2-2-rping-ignore-flushed-compl
-
----
-
-