refresh

diff --git a/meta b/meta
index 829c2c67f8f1036c4b434662f1fd249daffaf96e..87e06638f20819196571a59703fc7684b52d6e94 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b431e307efa81432d17f8d0b85cdb2394b500729
-Head: ab2249ce3b315bc58286b7f1ba19fa0f608e83dc
+Previous: 5e52407a6990c936067d5d147670aaadebbc5e11
+Head: a1f7a896dbf6bbe57a220cc1fb2ae32141da226c
 Applied:
   lazy-init: 23ffef06cf462c4c5ac4ec5880b96c8719b64774
-  rs-inline: 8347a54e8d345d0a499b6582d67e44043e886a82
-  refresh-temp: ab2249ce3b315bc58286b7f1ba19fa0f608e83dc
+  rs-inline: a1f7a896dbf6bbe57a220cc1fb2ae32141da226c
 Unapplied:
   old-af-ib: aaa0d9ca917c8c361a978e5a116963c2cceac5ba
   old-seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index e696294..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 589161ae78e6cb97402984e81f5f917493d82619
-Top:    55ffa8849cf2c6e18856f1e9d278573786bcb7f0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-04-16 21:52:26 -0700
-
-Refresh of rs-inline
-
----
-
-diff --git a/src/cma.h b/src/cma.h
-index 4c991b4..a7bab0f 100644
---- a/src/cma.h
-+++ b/src/cma.h
-@@ -158,7 +158,7 @@ static inline int ERR(int err)
-       return -1;
- }
- 
--int ucma_init();
-+int ucma_init(void);
- extern int af_ib_support;
- 
- #define RAI_ROUTEONLY         0x01000000

diff --git a/patches/rs-inline b/patches/rs-inline
index 5244e6ed9198b85803d720969e3a15d64f021771..b77f81cc095eaf7deaabf32f84e44e058fb24fce 100644 (file)
--- a/patches/rs-inline
+++ b/patches/rs-inline
@@ -1,5 +1,5 @@
 Bottom: 09ed451c6b5c30d2dbe0bbedc3379ef8034dc899
-Top:    589161ae78e6cb97402984e81f5f917493d82619
+Top:    55ffa8849cf2c6e18856f1e9d278573786bcb7f0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-04-16 21:42:06 -0700
 
@@ -32,19 +32,6 @@ index 0dc229e..4fa41ff 100644
  {
        int i, ret = 0;
  
-diff --git a/src/cma.h b/src/cma.h
-index a7bab0f..4c991b4 100644
---- a/src/cma.h
-+++ b/src/cma.h
-@@ -158,7 +158,7 @@ static inline int ERR(int err)
-       return -1;
- }
- 
--int ucma_init(void);
-+int ucma_init();
- extern int af_ib_support;
- 
- #define RAI_ROUTEONLY         0x01000000
 diff --git a/src/rsocket.c b/src/rsocket.c
 index 30ea55d..8325edf 100644
 --- a/src/rsocket.c