From 626716f1e965b3150713154a083c1e066e317c34 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 18 Jan 2013 16:16:02 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/refresh-temp | 21 --------------------- patches/rsockets-add-support-for-exist | 14 +++++++++++++- 3 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 4ec790d0..ec2b2ca1 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 14ecbbc4949b9cb2dd44b1ce27347814a1d096d0 -Head: 0c4105209527d5a2b24fb4cd06f7295f94b43665 +Previous: affaf5736564d6f7341330d7ca89042cf550405f +Head: 56e1a7cd4904fbfde59adbdfedd5374e5bde2e87 Applied: - rsockets-add-support-for-exist: fa37ec50248e8bc04a9a6662dcd2183bfc93af54 - refresh-temp: 0c4105209527d5a2b24fb4cd06f7295f94b43665 + rsockets-add-support-for-exist: 56e1a7cd4904fbfde59adbdfedd5374e5bde2e87 Unapplied: af-ib-conn: 08fc3e9eddae4f550c43a25eb8fdb73091aef28f addrtype: 168846ffb332698287dbca5c970ab9cdf1a91830 diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 19f61839..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,21 +0,0 @@ -Bottom: 1d1da945e49647331f04f82a45cc353e9541a6ae -Top: 87aac2094972e0392ac4742a2c54ba76c2f5747a -Author: Sean Hefty -Date: 2013-01-18 16:16:02 -0800 - -Refresh of rsockets-add-support-for-exist - ---- - -diff --git a/src/cma.h b/src/cma.h -index 7135a61..bdd6a85 100644 ---- a/src/cma.h -+++ b/src/cma.h -@@ -158,6 +158,7 @@ static inline int ERR(int err) - } - - int ucma_init(); -+void ucma_ib_init(); - extern int af_ib_support; - - #define RAI_ROUTEONLY 0x01000000 diff --git a/patches/rsockets-add-support-for-exist b/patches/rsockets-add-support-for-exist index bd378132..e8eeedf9 100644 --- a/patches/rsockets-add-support-for-exist +++ b/patches/rsockets-add-support-for-exist @@ -1,5 +1,5 @@ Bottom: cf8998b9f06f893b499b9478f40610fb02b1993a -Top: 1d1da945e49647331f04f82a45cc353e9541a6ae +Top: 87aac2094972e0392ac4742a2c54ba76c2f5747a Author: Sean Hefty Date: 2013-01-09 14:54:47 -0800 @@ -31,6 +31,18 @@ Signed-off-by: Sean Hefty --- +diff --git a/src/cma.h b/src/cma.h +index 7135a61..bdd6a85 100644 +--- a/src/cma.h ++++ b/src/cma.h +@@ -158,6 +158,7 @@ static inline int ERR(int err) + } + + int ucma_init(); ++void ucma_ib_init(); + extern int af_ib_support; + + #define RAI_ROUTEONLY 0x01000000 diff --git a/src/rsocket.c b/src/rsocket.c index 7be42ca..9b6c667 100644 --- a/src/rsocket.c -- 2.46.0