refresh

diff --git a/meta b/meta
index 066f53d3142f1729423c096d034f1b5e138e802f..24885ffbc893373eebfa90b45f2e2325991396a3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 261308e6ca917701464db8aab00af469708570f5
-Head: db842c80633cb1cb91ed4ce82f963a6f82903a50
+Previous: bc361f7c3d95d55b9ddcc125b8ab92c7e9d220b5
+Head: da0dc6c83bcbb4c98e81c23ee26f7c559f448ec6
 Applied:
   nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
   nd-heap: 1a16264e443de2a1140722ea4640cfc953d66527
   wv-reg: b56cb8d7a7baca6cf432141dda100e4484142029
   nd-prov: 2097cd64354896a52017ad0c866edcc9d4e58021
-  nd-adapt-query: 41c46013e1aa7baf2eaa1bffbb1849989c9da7cc
-  refresh-temp: db842c80633cb1cb91ed4ce82f963a6f82903a50
+  nd-adapt-query: da0dc6c83bcbb4c98e81c23ee26f7c559f448ec6
 Unapplied:
   mr: f51d6fff0d9baa6ae68372e4d0a01c537a47c37e
   sge: b835b8012f9abf2cdcb4335ffa3f0c5cd8b9b88c

diff --git a/patches/nd-adapt-query b/patches/nd-adapt-query
index cb814695a7ce41121d7831b73a63a2b2e2e1516e..8fdee273ff4c32a8463e7aa6508c854d12d254a0 100644 (file)
--- a/patches/nd-adapt-query
+++ b/patches/nd-adapt-query
@@ -1,5 +1,5 @@
 Bottom: 4ef73e072138e03dcd3845c4973b982eb0aa28cc
-Top:    cb8b3a34f27c8d10f5120cc17b6523546eb301bb
+Top:    deb6a1386b4cfd034b6b42837adf5c3cad9fe1cb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:06:51 -0700
 
@@ -14,10 +14,17 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 34e9fc7..55fba91 100644
+index 34e9fc7..025ed7f 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -116,16 +116,17 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+@@ -1,5 +1,6 @@
+ /*\r
+  * Copyright (c) 2009-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
+@@ -116,16 +117,17 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
        WV_DEVICE_ATTRIBUTES attr;\r
        HRESULT hr;\r
  \r
@@ -40,7 +47,7 @@ index 34e9fc7..55fba91 100644
        if (FAILED(hr)) {\r
                goto out;\r
        }\r
-@@ -157,7 +158,7 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
+@@ -157,7 +159,7 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
  \r
  out:\r
        *pcbInfo = sizeof(ND_ADAPTER_INFO);\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 9dcbf95..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,20 +0,0 @@
-Bottom: cb8b3a34f27c8d10f5120cc17b6523546eb301bb
-Top:    deb6a1386b4cfd034b6b42837adf5c3cad9fe1cb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-27 13:59:01 -0700
-
-Refresh of nd-adapt-query
-
----
-
-diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-index 55fba91..025ed7f 100644
---- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
-+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -1,5 +1,6 @@
- /*\r
-  * Copyright (c) 2009-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: