refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..f77597f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,61 @@
+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; }