pop

diff --git a/meta b/meta
index 1758c38ef7a7e7b05131dc1fd444459b13841933..9020013812d3c1f3a07c61da58e7b89ddde1a731 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4b0da927e3a428679ad8241e4e2899bcb72a6190
-Head: 3138c2d06c67aac0639153a1c992b49ec9f1d620
+Previous: 8f9e8e040717d8a0f46b4ccc547e94e416544a8f
+Head: f00370179e2dcdfb8aaf58da81785439872a8557
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -8,8 +8,8 @@ Applied:
   nd-prov2: 61a1070ec9016e11f409ee637d9fba3946453b85
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
   nd-adapt: 3138c2d06c67aac0639153a1c992b49ec9f1d620
+  sge: f00370179e2dcdfb8aaf58da81785439872a8557
 Unapplied:
-  sge: b92e6586257b3937ddf556dc3872778a76ac94a5
   mr: 109bb2efd3748d8126bc22861a2fdbdc3632dbae
   srq: a6bde949a5e33284154d3fd4753cc26d6cf0cbde
   srq-32: 042f9096ac6150b6b4b8ff019b639b5f91050710

diff --git a/patches/sge b/patches/sge
index cd95be6edfe9f2865f7264e7c847f2b524db44ee..18bf9c25a5356ccb62434065cc1bb83afd4f8bae 100644 (file)
--- a/patches/sge
+++ b/patches/sge
@@ -1,5 +1,5 @@
-Bottom: e360be789abd5a318636040ac4b013ab010955b3
-Top:    c6c05c26a09501c6e30031b29ce5f388663f07c9
+Bottom: dfbc711c3bd688bd28c603f2cc2911009240f1c9
+Top:    6e09d66b7501a9b4ba07765b3e95b266618e6ba3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:39:09 -0700
 
@@ -14,7 +14,7 @@ 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 891741e..736c649 100644
+index 408a133..e7c3b96 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
 @@ -136,9 +136,9 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)