pop

diff --git a/meta b/meta
index 5b8a2c67fd1d4d38dd99c6f417d0c9ee1cf78d73..595fe8e3530b8639c64202998cda5d2e53cd7ff2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: c94c60f52e4964d295d7f154e85436af5bf40906
-Head: e6d6179a65aa26829d1c132a6508fcb66556b952
+Previous: 7cad100894d7168c70a39529e40620800c5e3d36
+Head: 86b07a20aa4a1241894d41cd8458e4b813937302
 Applied:
   nd2: f6ad71f3726dd9ddc572452b92ee1b73f56f3004
   nd-heap: 1a16264e443de2a1140722ea4640cfc953d66527
@@ -12,8 +12,8 @@ Applied:
   srq-32: 549dc283e162395d4cad1ca2777c97fa8499b686
   qp-init: 7d030b48de9d34d5266e9aed7f56bb07f4c587bb
   qp-flush: e6d6179a65aa26829d1c132a6508fcb66556b952
+  cq-group: 86b07a20aa4a1241894d41cd8458e4b813937302
 Unapplied:
-  cq-group: 282636f3f28d9ccad8e9cb207b6a8844743c22e9
   srq-group: 70f126fab975c083efbaae391043a4929cf013e7
   cq-status: 32822edfd7095c39f7dd9ba4347ecf4ac8b9a258
   wv-rm-ioctl: 2c4f8b27f89993bc9c1215e8c358046b2934f755

diff --git a/patches/cq-group b/patches/cq-group
index 0777d175d58d91922e1d4059437293993b6cabb3..0b0e5bd6e464e906c5875b979cb7eb7e1230c8cc 100644 (file)
--- a/patches/cq-group
+++ b/patches/cq-group
@@ -1,5 +1,5 @@
-Bottom: 8e5dd8e196a668ada8b33b0eaf01129d1ee2c443
-Top:    2864d6adb87a4d885026f286adf07ed040e1cea2
+Bottom: 8610aa7a99cb00be3c1d94ba3e9e446f9d8dcd03
+Top:    433c35ec9a867a050b14e5de51de290dac7eb8a1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-26 23:55:41 -0700
 
@@ -11,10 +11,10 @@ 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 55fba91..a5977fa 100644
+index 025ed7f..cdb1044 100644
 --- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
 +++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
-@@ -171,7 +171,8 @@ STDMETHODIMP CNDAdapter::
+@@ -172,7 +172,8 @@ STDMETHODIMP CNDAdapter::
  CreateCompletionQueue(REFIID iid, DWORD queueDepth, USHORT group, KAFFINITY affinity,\r
                                          VOID** ppCompletionQueue)\r
  {\r