refresh

diff --git a/meta b/meta
index d6097ff47a2ea84733a54ac283a382db206abd84..d99d96949e29e126be3e12670e259f21f74a9886 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: c03377f4ff2f9498e2733cc4b1430a406234fb67
-Head: 5ef5be5860ff433c26b1d12fc6b9cebcefb1be39
+Previous: 90594bb9d006a4d9f7fbf057543816ae43bd9ced
+Head: 2097cd64354896a52017ad0c866edcc9d4e58021
 Applied:
   nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
   nd-heap: 1a16264e443de2a1140722ea4640cfc953d66527
   wv-reg: b56cb8d7a7baca6cf432141dda100e4484142029
-  nd-prov: 87a4e34fea0f0aa40db01dd469858460a8e8a35a
-  refresh-temp: 5ef5be5860ff433c26b1d12fc6b9cebcefb1be39
+  nd-prov: 2097cd64354896a52017ad0c866edcc9d4e58021
 Unapplied:
   nd-adapt-query: 6404eb270058e5c1ccff838f80a18464b43e4e04
   mr: f51d6fff0d9baa6ae68372e4d0a01c537a47c37e

diff --git a/patches/nd-prov b/patches/nd-prov
index 24728c300d4758caf4e625526606f19b92473b55..cca3505cf230be227b0153db98126f5de495fb2e 100644 (file)
--- a/patches/nd-prov
+++ b/patches/nd-prov
@@ -1,5 +1,5 @@
 Bottom: b685ecb31e4e3279cfefeda28c3b1e4ed75332dc
-Top:    a2f187a83227e964ddbdbf154910ae8421f1a01a
+Top:    4ef73e072138e03dcd3845c4973b982eb0aa28cc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 15:12:11 -0700
 
@@ -14,6 +14,30 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/trunk/core/winverbs/user/wv_provider.cpp b/trunk/core/winverbs/user/wv_provider.cpp
+index 65b0c87..53fae00 100644
+--- a/trunk/core/winverbs/user/wv_provider.cpp
++++ b/trunk/core/winverbs/user/wv_provider.cpp
+@@ -1,5 +1,6 @@
+ /*\r
+- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2008-2010 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.\r
+  *\r
+  * This software is available to you under the OpenIB.org BSD license\r
+  * below:\r
+diff --git a/trunk/core/winverbs/user/wv_provider.h b/trunk/core/winverbs/user/wv_provider.h
+index 5daa4c7..a9f5580 100644
+--- a/trunk/core/winverbs/user/wv_provider.h
++++ b/trunk/core/winverbs/user/wv_provider.h
+@@ -1,5 +1,6 @@
+ /*\r
+- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2008-2010 Intel Corporation. All rights reserved.\r
++ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.\r
+  *\r
+  * This software is available to you under the OpenIB.org BSD license\r
+  * below:\r
 diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
 index 968193d..6f94b71 100644
 --- a/trunk/ulp/netdirect2/user/nd_provider.cpp

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f6a2087..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,33 +0,0 @@
-Bottom: a2f187a83227e964ddbdbf154910ae8421f1a01a
-Top:    4ef73e072138e03dcd3845c4973b982eb0aa28cc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-27 13:56:03 -0700
-
-Refresh of nd-prov
-
----
-
-diff --git a/trunk/core/winverbs/user/wv_provider.cpp b/trunk/core/winverbs/user/wv_provider.cpp
-index 65b0c87..53fae00 100644
---- a/trunk/core/winverbs/user/wv_provider.cpp
-+++ b/trunk/core/winverbs/user/wv_provider.cpp
-@@ -1,5 +1,6 @@
- /*\r
-- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2008-2010 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.\r
-  *\r
-  * This software is available to you under the OpenIB.org BSD license\r
-  * below:\r
-diff --git a/trunk/core/winverbs/user/wv_provider.h b/trunk/core/winverbs/user/wv_provider.h
-index 5daa4c7..a9f5580 100644
---- a/trunk/core/winverbs/user/wv_provider.h
-+++ b/trunk/core/winverbs/user/wv_provider.h
-@@ -1,5 +1,6 @@
- /*\r
-- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2008-2010 Intel Corporation. All rights reserved.\r
-+ * Copyright (c) 2010 Microsoft Corporation.  All rights reserved.\r
-  *\r
-  * This software is available to you under the OpenIB.org BSD license\r
-  * below: