pop

diff --git a/meta b/meta
index a9757745e0485ae5ef53961fea583ee4210ec5aa..e94d92e4596819ff2cc90fb8be375c5b51393e4e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 0c8c0711d43925158efc753568d4c1c53c3c73b9
-Head: ad1ac06f554fd9be3f948747dbd57ffdc34765e6
+Previous: a439815734e8666f2a3d20bda4086caf3462b4f5
+Head: 38210187a47c8ff74392afdc5a792442309ebfe8
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -9,8 +9,8 @@ Applied:
   cma_bind_port: 59fe97f1022452db4632a4e0f55c2c77367f052c
   qp_type: e31ec93f02a7643e6f72bf918e44c9fca29dae23
   ucma_create_ps_ib: ad1ac06f554fd9be3f948747dbd57ffdc34765e6
+  ucma_event_ps_ib: 38210187a47c8ff74392afdc5a792442309ebfe8
 Unapplied:
-  ucma_event_ps_ib: 19025115b11abefaadbf787d0051d4f3e8e85294
   ps_ib_qkey: 5fc4173815ccd4895001bcdbd6111ca6fa06fb44
   bind_af_ib: a549d32972eb325e3fd02d5b12039e9c5f9c8c89
   cma_resolve_loopback: 9c437af437c875958211936bc66e8f2fe022a6dd

diff --git a/patches/ucma_event_ps_ib b/patches/ucma_event_ps_ib
index 7f2fa1ac4547f6344b8b348e2530691fdc027e45..91d508168d447ed8b7f91a562f4af543cec191d5 100644 (file)
--- a/patches/ucma_event_ps_ib
+++ b/patches/ucma_event_ps_ib
@@ -1,5 +1,5 @@
-Bottom: 4863405794a01beb272b0cb78a05f630b98a39cc
-Top:    c07911133fe048d9066b6afc923767db0133ed52
+Bottom: 56a78dac197df0d1776b55614aea597a95700566
+Top:    26b5b71a0a7acdc75d2b1cd591e4c5eb59dabc6c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-03-30 16:22:34 -0800
 
@@ -15,10 +15,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
-index 7a59039..723fe83 100644
+index 0693f79..9393c31 100644
 --- a/drivers/infiniband/core/ucma.c
 +++ b/drivers/infiniband/core/ucma.c
-@@ -258,7 +258,7 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,
+@@ -259,7 +259,7 @@ static int ucma_event_handler(struct rdma_cm_id *cm_id,
        ucma_set_event_context(ctx, event, uevent);
        uevent->resp.event = event->event;
        uevent->resp.status = event->status;