From dbd2e3c4c08adeff154c67f5324f889e248a5e0a Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 29 Apr 2014 20:12:12 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/init-static | 15 +++++++++++++-- patches/refresh-temp | 21 --------------------- 3 files changed, 16 insertions(+), 27 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 0a5384f0..ba1ef8df 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: e099a636c88636eb89592e4eb04d8911e2dd963b -Head: 23b862b6821c593d15caaec8f5dac5ded190f74f +Previous: 02572d116834b053f69689c8ef79ba0f5ad3a478 +Head: 8ce5823e02b6a38fd5ed7e11a1bb586847dbcb03 Applied: - init-static: dc1020c458ed4bad21a019af74868b1f897accfe - refresh-temp: 23b862b6821c593d15caaec8f5dac5ded190f74f + init-static: 8ce5823e02b6a38fd5ed7e11a1bb586847dbcb03 Unapplied: rsocket-check-max-inline-data-: 4243da0ad9206c662b3a3c8ba7a9f4b2b7269d3f rsocket-dedicate-a-fixed-numbe: fa7872e54b5ef5a986cdfcc4d2a895c3a0c733c8 diff --git a/patches/init-static b/patches/init-static index 223f7266..aa56e527 100644 --- a/patches/init-static +++ b/patches/init-static @@ -1,5 +1,5 @@ Bottom: 09ed451c6b5c30d2dbe0bbedc3379ef8034dc899 -Top: 09ed451c6b5c30d2dbe0bbedc3379ef8034dc899 +Top: 1c60f4db6798ea721b5d8e64b7989ffbd653b24b Author: Sean Hefty Date: 2014-04-29 20:11:35 -0700 @@ -10,4 +10,15 @@ Signed-off-by: Sean Hefty --- - +diff --git a/src/cma.c b/src/cma.c +index 0dc229e..4fa41ff 100644 +--- a/src/cma.c ++++ b/src/cma.c +@@ -321,7 +321,7 @@ err: + return ret; + } + +-int ucma_init_all(void) ++static int ucma_init_all(void) + { + int i, ret = 0; diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 76b47853..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: 09ed451c6b5c30d2dbe0bbedc3379ef8034dc899 -Top: 1c60f4db6798ea721b5d8e64b7989ffbd653b24b -Author: Sean Hefty -Date: 2014-04-29 20:12:11 -0700 - -Refresh of init-static - ---- - -diff --git a/src/cma.c b/src/cma.c -index 0dc229e..4fa41ff 100644 ---- a/src/cma.c -+++ b/src/cma.c -@@ -321,7 +321,7 @@ err: - return ret; - } - --int ucma_init_all(void) -+static int ucma_init_all(void) - { - int i, ret = 0; -- 2.41.0