refresh

diff --git a/meta b/meta
index 0ad393daaefeb21b7358c46f720b5bc8210a5f93..d673f54c2a6fce530a4ac12ddde88e6a93c11be8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: fcc9a43e7bee934d656a72d2a00dc21e892033bf
-Head: 9378dfedc07ad168aec8139c449941d930e93b04
+Previous: 3fb37aeb4041e14b9319ad1ab252dd6244a9d82f
+Head: f403b6e0e391ff091cf4470746012022303a4fd2
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: db2252249eaafe3f972105eff26b4db71850b1b2
-  addrtype: 03d74ff10e17acc77e4decee022d6f2e02cb8a9d
-  refresh-temp: 9378dfedc07ad168aec8139c449941d930e93b04
+  addrtype: f403b6e0e391ff091cf4470746012022303a4fd2
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/addrtype b/patches/addrtype
index 2c3c703dab650fbd4771aa755bc8d7e72da90626..2485737cc0bad9fc7a908f8c850e4da572ce01bd 100644 (file)
--- a/patches/addrtype
+++ b/patches/addrtype
@@ -1,5 +1,5 @@
 Bottom: 7413d85582079678a2245ca49e793f0cd8ad5bd2
-Top:    b7b3726632c95160a455e9ae58f77cfdb6461db9
+Top:    26e9149c3dc895caf3714619ecb1b06cb6088f54
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-29 15:02:54 -0700
 
@@ -148,3 +148,36 @@ index 8d9fea0..25d881f 100644
  
  #if __BYTE_ORDER == __BIG_ENDIAN
  static inline uint64_t cpu_to_be64(uint64_t x) { return x; }
+diff --git a/man/ucmatose.1 b/man/ucmatose.1
+index 73477ea..baf5837 100644
+--- a/man/ucmatose.1
++++ b/man/ucmatose.1
+@@ -4,10 +4,10 @@ ucmatose \- RDMA CM connection and simple ping-pong test.
+ .SH SYNOPSIS
+ .sp
+ .nf
+-\fIucmatose\fR [-s server_address] [-b bind_address] [-c connections]
+-              [-C message_count] [-S message_size]
+-\fIucmatose\fR -s server_address [-b bind_address] [-c connections]
+-              [-C message_count] [-S message_size] [-t tos]
++\fIucmatose\fR [-s server_address] [-b bind_address] [-f address_format]
++              [-c connections] [-C message_count] [-S message_size]
++\fIucmatose\fR -s server_address [-b bind_address] [-f address_format]
++              [-c connections] [-C message_count] [-S message_size] [-t tos]
+ .fi
+ .SH "DESCRIPTION"
+ Establishes a set of reliable RDMA connections between two nodes using the
+@@ -22,6 +22,13 @@ This option must be specified by the client.
+ \-b bind_address
+ The local network address to bind to.
+ .TP
++\-f address_format
++Specifies the format of the server and bind address.  Be default, the
++format is determined by getaddrinfo() as either being a hostname, an IPv4
++address, or an IPv6 address.  This option may be used to indicate that
++a specific address format has been provided.  Supported address_format
++values are: name, ip, ipv6, and gid.
++.TP
+ \-c connections
+ The number of connections to establish between the client and server.
+ (default 1)

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 17c0703..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: b7b3726632c95160a455e9ae58f77cfdb6461db9
-Top:    26e9149c3dc895caf3714619ecb1b06cb6088f54
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-31 10:18:50 -0700
-
-Refresh of addrtype
-
----
-
-diff --git a/man/ucmatose.1 b/man/ucmatose.1
-index 73477ea..baf5837 100644
---- a/man/ucmatose.1
-+++ b/man/ucmatose.1
-@@ -4,10 +4,10 @@ ucmatose \- RDMA CM connection and simple ping-pong test.
- .SH SYNOPSIS
- .sp
- .nf
--\fIucmatose\fR [-s server_address] [-b bind_address] [-c connections]
--              [-C message_count] [-S message_size]
--\fIucmatose\fR -s server_address [-b bind_address] [-c connections]
--              [-C message_count] [-S message_size] [-t tos]
-+\fIucmatose\fR [-s server_address] [-b bind_address] [-f address_format]
-+              [-c connections] [-C message_count] [-S message_size]
-+\fIucmatose\fR -s server_address [-b bind_address] [-f address_format]
-+              [-c connections] [-C message_count] [-S message_size] [-t tos]
- .fi
- .SH "DESCRIPTION"
- Establishes a set of reliable RDMA connections between two nodes using the
-@@ -22,6 +22,13 @@ This option must be specified by the client.
- \-b bind_address
- The local network address to bind to.
- .TP
-+\-f address_format
-+Specifies the format of the server and bind address.  Be default, the
-+format is determined by getaddrinfo() as either being a hostname, an IPv4
-+address, or an IPv6 address.  This option may be used to indicate that
-+a specific address format has been provided.  Supported address_format
-+values are: name, ip, ipv6, and gid.
-+.TP
- \-c connections
- The number of connections to establish between the client and server.
- (default 1)