pop

diff --git a/meta b/meta
index f3c4be82abae454f80fb01332e1ad311fb64a272..98ab76b0ea7d588019012c9ed1ec31b388b81c2c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: d9edf980c7e09016e7d6a30d2968a2aa1de99a09
-Head: b92e6586257b3937ddf556dc3872778a76ac94a5
+Previous: e8c6d0a862edd676fb20b70e9f46820c3c75136d
+Head: 58b3d90c8cf61304a95047cd975489b79f3164d5
 Applied:
   nd-heap: 4073d4bd9835679d69e79783b4fd841e173ec458
   wv-reg: 2c86a99e122511e0ef8723c8ec08456f4002a39a
@@ -9,17 +9,17 @@ Applied:
   nd-adapt-query: 4b10643cd3ba9593cb4dcfd787bf8b1285dbbb2b
   nd-adapt: 1a4581b86e410fb947c09ce13178c84a3d6109be
   sge: b92e6586257b3937ddf556dc3872778a76ac94a5
+  mr: 109bb2efd3748d8126bc22861a2fdbdc3632dbae
+  srq: a6bde949a5e33284154d3fd4753cc26d6cf0cbde
+  srq-32: 042f9096ac6150b6b4b8ff019b639b5f91050710
+  listen: 5307a4f3b57320c4b131e4cc6dcd6797f4cff436
+  connect: 037d0c5a2b65a3e977d179a3354c89bab946d5fd
+  cq: 998f81bc7663896168ef9e16ba82d143c99dba11
+  qp: 23e4ebb8aff3a49021e176d522c7f0d8cb7cde5a
+  qp-init: 9b2b26c8a62f8cfb481031c6f193f5e41ec7637e
+  qp-flush: 5a9de531401b9e68488135f217ec35bef46a0fb6
+  nd-api: 58b3d90c8cf61304a95047cd975489b79f3164d5
 Unapplied:
-  mr: 8fa8a358b1dc122fd9ea02a12adfa68d07d135ba
-  srq: 7689e6ba658c885d336ca440078807cd94a73c0a
-  srq-32: be266abeb28d18c454cf459183f3398956f6bffd
-  listen: 6c7148901c287334c8bee46f50a003f7e63bc40b
-  connect: cc8420ffd9b12129fbaac6653784961c9ba1f5aa
-  cq: 8e52d23963f6f9c398bb0a0b2108f8639f8012bb
-  qp: 2dfc04b1c9293feef5843b8296c901ee3b01d4ca
-  qp-init: 038622a7dc7a08181dc3a857940d0f8df2285ed8
-  qp-flush: c7248a04f27022ef7d540f5f46e4afc43e4849f0
-  nd-api: 4860350b3b8cb90dff069a5cce75fbc8925a60ce
   cq-status: 32822edfd7095c39f7dd9ba4347ecf4ac8b9a258
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755
   wv-ver: 9abd550558317c525e7f7f82caae75f1a810d2b7

diff --git a/patches/connect b/patches/connect
index 09571ee26bfe5dd735ddf60fc00af68dc753a7f8..5087a88eeb0616f4d67d88f2d0c9ccb630e51e06 100644 (file)
--- a/patches/connect
+++ b/patches/connect
@@ -1,5 +1,5 @@
-Bottom: 895c61750329bced91d26f7d59f019fac7a84322
-Top:    9573aac57e4f703e7e13eaeabb521a0c8281a8fe
+Bottom: 5c0b56fd6cda4d55994463777591f54b0b5992b9
+Top:    b19bd1e28749dcfd9f6f5872d08fa75288627a87
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 17:42:23 -0700
 

diff --git a/patches/cq b/patches/cq
index 243988b005035783efeeb5e8e2d36720328ed19f..2a431442a266e93b6f12ece8e90c6e77e3f3015a 100644 (file)
--- a/patches/cq
+++ b/patches/cq
@@ -1,5 +1,5 @@
-Bottom: 9573aac57e4f703e7e13eaeabb521a0c8281a8fe
-Top:    211e9d0c6e088ea806a3effe188903aa859ccfc5
+Bottom: b19bd1e28749dcfd9f6f5872d08fa75288627a87
+Top:    2b700fb8c1e878000926a5d5b4d59418ae348345
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:04:54 -0700
 

diff --git a/patches/listen b/patches/listen
index 7e28da9173bb1b55aa978070af9838a90fb958da..f78ebc45f10c8de575169a8e2902ea5f11a5c50a 100644 (file)
--- a/patches/listen
+++ b/patches/listen
@@ -1,5 +1,5 @@
-Bottom: a4bc332d7056e92b8b09fcf86797a21718bc598d
-Top:    895c61750329bced91d26f7d59f019fac7a84322
+Bottom: 3fa9eff1ec7344881f13c804b268c167cf75c52a
+Top:    5c0b56fd6cda4d55994463777591f54b0b5992b9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 17:39:07 -0700
 

diff --git a/patches/mr b/patches/mr
index 4f1e4bebf621874b5be4123a805dcba7db8c3422..7d244bf3410623a8157ac99208082968b6b40349 100644 (file)
--- a/patches/mr
+++ b/patches/mr
@@ -1,5 +1,5 @@
-Bottom: 8c54d8be19bf3a8a3f8089744ef7bdb2b7063088
-Top:    2b3e7dbf0f7a7e72d87aa0aaed8bf5aa73b46ce8
+Bottom: c6c05c26a09501c6e30031b29ce5f388663f07c9
+Top:    14663d66da3845e9214df8dc83920783a6af813b
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 16:51:57 -0700
 

diff --git a/patches/nd-api b/patches/nd-api
index e7da5eff7f62700cc8a55e0429afd049d84f1d36..8159ee1f0c9535c920eaa29c09a552017196e1c0 100644 (file)
--- a/patches/nd-api
+++ b/patches/nd-api
@@ -1,5 +1,5 @@
-Bottom: 44d102c5b8cad0d4225b69cafd43ccac55e541ad
-Top:    51dcc2072f5f1e03ef5a73f8a67599e2b925bdfe
+Bottom: b269dba1b49b71ce08469246e7895297c562af28
+Top:    dd4fce99223e0fa9d7fbeaad638d1679a1f30099
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:34:49 -0700
 
@@ -11,7 +11,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 d3e4660..c0f9263 100644
+index 736c649..f8a41fc 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
 @@ -142,10 +142,10 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)

diff --git a/patches/qp b/patches/qp
index 073a5677d404574bf69093fd033bff65a50a6591..c4308c44eb82e9574d5d172cc26171b24986ef86 100644 (file)
--- a/patches/qp
+++ b/patches/qp
@@ -1,5 +1,5 @@
-Bottom: 211e9d0c6e088ea806a3effe188903aa859ccfc5
-Top:    0caba7e37d44fb34e07f77cbe033e53c08aa3a1a
+Bottom: 2b700fb8c1e878000926a5d5b4d59418ae348345
+Top:    046e031bd69db2383252c81975a9eb9c1291e733
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:13:21 -0700
 

diff --git a/patches/qp-flush b/patches/qp-flush
index dbbf956fdc251c30981047aef74206e3df9533f5..b2966d7d5565d65237e395001bc04531652447e2 100644 (file)
--- a/patches/qp-flush
+++ b/patches/qp-flush
@@ -1,5 +1,5 @@
-Bottom: 896d3e870d4b29664bcc2381afe0bc4540cb2dc2
-Top:    44d102c5b8cad0d4225b69cafd43ccac55e541ad
+Bottom: 7802e73c08cfb478e8eab5a712be313957f67d94
+Top:    b269dba1b49b71ce08469246e7895297c562af28
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:26:09 -0700
 

diff --git a/patches/qp-init b/patches/qp-init
index 71b1e2604f07b7b4c329794f2fbe1090b5f255f0..71df6ff1f1542af75a3764a927df7c03bd521d7f 100644 (file)
--- a/patches/qp-init
+++ b/patches/qp-init
@@ -1,5 +1,5 @@
-Bottom: 0caba7e37d44fb34e07f77cbe033e53c08aa3a1a
-Top:    896d3e870d4b29664bcc2381afe0bc4540cb2dc2
+Bottom: 046e031bd69db2383252c81975a9eb9c1291e733
+Top:    7802e73c08cfb478e8eab5a712be313957f67d94
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:24:13 -0700
 

diff --git a/patches/srq b/patches/srq
index b44d8ca4d95c88fc88aac6dc3bf4661557c39a2c..c71d95ebf1175aa04109efaf63452d14d62bdc9a 100644 (file)
--- a/patches/srq
+++ b/patches/srq
@@ -1,5 +1,5 @@
-Bottom: 2b3e7dbf0f7a7e72d87aa0aaed8bf5aa73b46ce8
-Top:    74517027826b9c312dbfbfb92926a1e90f9f4a81
+Bottom: 14663d66da3845e9214df8dc83920783a6af813b
+Top:    2764aa3f590689be773940186f807027abb288d7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 17:23:20 -0700
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index db96979..7e97169 100644
+index c64b9af..7499617 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
-@@ -101,6 +101,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
+@@ -100,6 +100,12 @@ GetOverlappedResult(OVERLAPPED *pOverlapped, BOOL bWait)
  }\r
  \r
  STDMETHODIMP CNDSharedReceiveQueue::\r
@@ -28,7 +28,7 @@ index db96979..7e97169 100644
  {\r
        HRESULT hr;\r
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
-index b748256..9b77023 100644
+index b4f2058..5384036 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.h
 +++ b/trunk/ulp/netdirect2/user/nd_srq.h
 @@ -51,6 +51,7 @@ public:

diff --git a/patches/srq-32 b/patches/srq-32
index 6b8909dc94f65a0b0d6cb85d41230ef8e29c26fc..5de07cd2b5dcc5eb1bcf9af04a35ec1db3e141eb 100644 (file)
--- a/patches/srq-32
+++ b/patches/srq-32
@@ -1,5 +1,5 @@
-Bottom: 74517027826b9c312dbfbfb92926a1e90f9f4a81
-Top:    a4bc332d7056e92b8b09fcf86797a21718bc598d
+Bottom: 2764aa3f590689be773940186f807027abb288d7
+Top:    3fa9eff1ec7344881f13c804b268c167cf75c52a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 17:30:12 -0700
 
@@ -17,10 +17,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
-index 7e97169..5d10de2 100644
+index 7499617..0703aa9 100644
 --- a/trunk/ulp/netdirect2/user/nd_srq.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
-@@ -124,6 +124,16 @@ Notify(OVERLAPPED* pOverlapped)
+@@ -123,6 +123,16 @@ Notify(OVERLAPPED* pOverlapped)
        return NDConvertWVStatus(hr);\r
  }\r
  \r
@@ -37,7 +37,7 @@ index 7e97169..5d10de2 100644
  STDMETHODIMP CNDSharedReceiveQueue::\r
  Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)\r
  {\r
-@@ -132,3 +142,37 @@ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
+@@ -131,3 +141,37 @@ Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
        hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);\r
        return NDConvertWVStatus(hr);\r
  }\r