refresh

diff --git a/meta b/meta
index eb1806987778a49612f570041bcf61ba1f4ebc73..6a8b17c03ec532bcbdf21a6ef5d6068dccc9fd02 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 231db1a63f879640fbe00702d42cd034f163773a
-Head: 7e1e993c7b50e3cee74b1858df58d8ee6f3a69fd
+Previous: 31e32629e18deb0218abf89f1e6b95b997874966
+Head: cee2f347b27737ecd83d98e22c581c6bbd608e96
 Applied:
   sa_family: 79ecff9afd483c22821eca679e7ed668035ab4c1
   af_ib: ed14c624d882d21df3e2d0c022cffab0b7f664b9
   ren-copy-rai: a7ae817991416863772d28d97839ee8daeefb07e
   addrinfo-af-ib: f98ce7c3d4d19bb1a3fab5d0adbe97fd6a84e805
-  addrtype: 15d98f735dd81cb3e1eebf5f8cf1b172d3ba4675
-  refresh-temp: 7e1e993c7b50e3cee74b1858df58d8ee6f3a69fd
+  addrtype: cee2f347b27737ecd83d98e22c581c6bbd608e96
 Unapplied:
   dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a
   dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a

diff --git a/patches/addrtype b/patches/addrtype
index 7060b2db89fab982161175f8899eb5a847fb3633..5aea270722f5a5294906792259e058e353626275 100644 (file)
--- a/patches/addrtype
+++ b/patches/addrtype
@@ -1,5 +1,5 @@
 Bottom: 4ce62c6180a5ad6e3d7080ab386b955959166fc1
-Top:    29c9da5494261c5f46bb469941ba77d30e344aab
+Top:    37d2010ca6d23762f290e35d6a3474ff9d72123b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-29 15:02:54 -0700
 
@@ -15,9 +15,16 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 94fc4cd..1ff87d6 100644
+index 94fc4cd..8d11f33 100644
 --- a/examples/cmatose.c
 +++ b/examples/cmatose.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005-2006,2011 Intel Corporation.  All rights reserved.
++ * Copyright (c) 2005-2006,2011-2012 Intel Corporation.  All rights reserved.
+  *
+  * This software is available to you under a choice of one of two
+  * licenses.  You may choose to be licensed under the terms of the GNU
 @@ -81,6 +81,7 @@ static uint8_t tos;
  static uint8_t migrate = 0;
  static char *dst_addr;
@@ -79,8 +86,8 @@ index 94fc4cd..1ff87d6 100644
                        printf("usage: %s\n", argv[0]);
                        printf("\t[-s server_address]\n");
                        printf("\t[-b bind_address]\n");
-+                      printf("\t[-f address_format]\n")
-+                      printf("\t    name, ip, ipv6, or gid\n")
++                      printf("\t[-f address_format]\n");
++                      printf("\t    name, ip, ipv6, or gid\n");
                        printf("\t[-c connections]\n");
                        printf("\t[-C message_count]\n");
                        printf("\t[-S message_size]\n");
@@ -101,9 +108,16 @@ index 94fc4cd..1ff87d6 100644
        printf("test complete\n");
        destroy_nodes();
 diff --git a/examples/common.c b/examples/common.c
-index 3eeb1e9..eeee046 100644
+index 3eeb1e9..89e76f9 100644
 --- a/examples/common.c
 +++ b/examples/common.c
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
++ * Copyright (c) 2005-2006,2012 Intel Corporation.  All rights reserved.
+  *
+  * This software is available to you under a choice of one of two
+  * licenses.  You may choose to be licensed under the terms of the GNU
 @@ -56,7 +56,7 @@ int get_rdma_addr(char *src, char *dst, char *port,
  
        rai_hints = *hints;
@@ -113,3 +127,22 @@ index 3eeb1e9..eeee046 100644
                ret = rdma_getaddrinfo(src, NULL, &rai_hints, &res);
                if (ret)
                        return ret;
+diff --git a/examples/common.h b/examples/common.h
+index 8d9fea0..25d881f 100644
+--- a/examples/common.h
++++ b/examples/common.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2005-2011 Intel Corporation.  All rights reserved.
++ * Copyright (c) 2005-2012 Intel Corporation.  All rights reserved.
+  *
+  * This software is available to you under a choice of one of two
+  * licenses.  You may choose to be licensed under the terms of the GNU
+@@ -37,6 +37,7 @@
+ #include <byteswap.h>
+ 
+ #include <rdma/rdma_cma.h>
++#include <infiniband/ib.h>
+ 
+ #if __BYTE_ORDER == __BIG_ENDIAN
+ static inline uint64_t cpu_to_be64(uint64_t x) { return x; }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f77597f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,61 +0,0 @@
-Bottom: 29c9da5494261c5f46bb469941ba77d30e344aab
-Top:    37d2010ca6d23762f290e35d6a3474ff9d72123b
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-08-29 15:44:51 -0700
-
-Refresh of addrtype
-
----
-
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 1ff87d6..8d11f33 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005-2006,2011 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2005-2006,2011-2012 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-@@ -681,8 +681,8 @@ int main(int argc, char **argv)
-                       printf("usage: %s\n", argv[0]);
-                       printf("\t[-s server_address]\n");
-                       printf("\t[-b bind_address]\n");
--                      printf("\t[-f address_format]\n")
--                      printf("\t    name, ip, ipv6, or gid\n")
-+                      printf("\t[-f address_format]\n");
-+                      printf("\t    name, ip, ipv6, or gid\n");
-                       printf("\t[-c connections]\n");
-                       printf("\t[-C message_count]\n");
-                       printf("\t[-S message_size]\n");
-diff --git a/examples/common.c b/examples/common.c
-index eeee046..89e76f9 100644
---- a/examples/common.c
-+++ b/examples/common.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2005-2006,2012 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-diff --git a/examples/common.h b/examples/common.h
-index 8d9fea0..25d881f 100644
---- a/examples/common.h
-+++ b/examples/common.h
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2005-2011 Intel Corporation.  All rights reserved.
-+ * Copyright (c) 2005-2012 Intel Corporation.  All rights reserved.
-  *
-  * This software is available to you under a choice of one of two
-  * licenses.  You may choose to be licensed under the terms of the GNU
-@@ -37,6 +37,7 @@
- #include <byteswap.h>
- 
- #include <rdma/rdma_cma.h>
-+#include <infiniband/ib.h>
- 
- #if __BYTE_ORDER == __BIG_ENDIAN
- static inline uint64_t cpu_to_be64(uint64_t x) { return x; }