From 95273ffce05ddbaee52a5041926eab3afcb314b5 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 27 Jul 2010 00:02:34 -0700
Subject: [PATCH] pop

---
 meta             |  6 +++---
 patches/nd-prov2 | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta b/meta
index b58272aa..a19eeb5a 100644
--- a/meta
+++ b/meta
@@ -1,12 +1,12 @@
 Version: 1
-Previous: 02077b03eb027dee9601e5c2019322902fdc9c4c
-Head: 0a02ac93d7287bbdc48578efcf676190572718f1
+Previous: 2d78ee7067f3321f289977ec53b8af282dc60ef3
+Head: 80376da1a5548f9733d9f4ff666dc9cca3ffecae
 Applied:
+  nd-prov2: 80376da1a5548f9733d9f4ff666dc9cca3ffecae
 Unapplied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
   nd-prov: 81ab80a03d5f8659869a1bec2a2ab68a3ebf8626
-  nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
   nd-adapt: 3138c2d06c67aac0639153a1c992b49ec9f1d620
   sge: f00370179e2dcdfb8aaf58da81785439872a8557
diff --git a/patches/nd-prov2 b/patches/nd-prov2
index 48badb9a..cc9df8a1 100644
--- a/patches/nd-prov2
+++ b/patches/nd-prov2
@@ -1,5 +1,5 @@
-Bottom: 74dffe20d8d441f8b0882c6abb75c5d7588c4d83
-Top:    2a8179400fd6ad6b1768f2c0ce95648d58fad1d5
+Bottom: 06cdce656914daffeb60188020c0cbccef3f6806
+Top:    1f78a7c1e7803c06e617849d4d23638d6538087f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 15:39:48 -0700
 
@@ -24,10 +24,10 @@ index 9821570..4210ee3 100644
  		HRESULT hr;
  		CNDAdapter *adapter;
 diff --git a/trunk/ulp/netdirect2/user/nd_provider.cpp b/trunk/ulp/netdirect2/user/nd_provider.cpp
-index fc7988b..6f94b71 100644
+index 92835fd..968193d 100644
 --- a/trunk/ulp/netdirect2/user/nd_provider.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_provider.cpp
-@@ -163,8 +163,12 @@ ResolveAddress(const struct sockaddr* pAddress, SIZE_T cbAddress, UINT64* pAdapt
+@@ -148,8 +148,12 @@ ResolveAddress(const struct sockaddr* pAddress, SIZE_T cbAddress, UINT64* pAdapt
  }
  
  STDMETHODIMP CNDProvider::
@@ -42,7 +42,7 @@ index fc7988b..6f94b71 100644
  }
  
 diff --git a/trunk/ulp/netdirect2/user/nd_provider.h b/trunk/ulp/netdirect2/user/nd_provider.h
-index b636cfc..0c38d8e 100644
+index 15a74f6..b0e3709 100644
 --- a/trunk/ulp/netdirect2/user/nd_provider.h
 +++ b/trunk/ulp/netdirect2/user/nd_provider.h
 @@ -49,7 +49,7 @@ public:
-- 
2.46.0