pop

diff --git a/meta b/meta
index 75461282564507a4b9f4aad4ac8a32ac3cdfebe1..51c66001614fa878551ac8f253d1f2bfbc18b699 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: fcdcd10df1480b64a8404627df30f96f5569d5d5
-Head: 45fe5aaa86f0e8699516378400fb30b785f1095d
+Previous: 4322c4fd913bdb1bef39ed066a663101ef6a1104
+Head: 8deb7cadb25d9ea5be455ee15e2f3dd5a14da4d5
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -26,8 +26,8 @@ Applied:
   query_gid: f555e7ff6b0d5003ada002678316d1484703912e
   bind_ip: 307be975867c2451991b19c73e659d283bd76ac3
   bind_addr: 45fe5aaa86f0e8699516378400fb30b785f1095d
+  resolve_addr: 8deb7cadb25d9ea5be455ee15e2f3dd5a14da4d5
 Unapplied:
-  resolve_addr: 3eea7538d40c92fda684529108aa810c454c58d0
   mcast_addr: c7e828defc737eaf6a99efde2ec1b73312c558e0
   set_num_paths: 4df9cc738c8d36efcf8403d0e7494b4e9360bf2f
 Hidden:

diff --git a/patches/resolve_addr b/patches/resolve_addr
index 8acbb5791b5ae4dc17d15deb7ef3b76bc6e74f75..3f9ab9dd0edfa75417f76b543d6c96fd79d07ba3 100644 (file)
--- a/patches/resolve_addr
+++ b/patches/resolve_addr
@@ -1,5 +1,5 @@
-Bottom: 623118dd960570f0be259dc06b70cbb8e6e9611b
-Top:    d6f38b04b5440d7ba685ae5717ce4ea6bca18201
+Bottom: fddfdd3fba730c530419ee0112e702ef0f66cdcf
+Top:    f8ef353d745ae3d5119a459ee3bf54e30e22e7f8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:43 -0700
 
@@ -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 71edcd9..da85dee 100644
+index dc8c53f..89771c0 100644
 --- a/drivers/infiniband/core/ucma.c
 +++ b/drivers/infiniband/core/ucma.c
-@@ -582,6 +582,33 @@ static ssize_t ucma_resolve_ip(struct ucma_file *file,
+@@ -583,6 +583,33 @@ static ssize_t ucma_resolve_ip(struct ucma_file *file,
        return ret;
  }
  
@@ -52,7 +52,7 @@ index 71edcd9..da85dee 100644
  static ssize_t ucma_resolve_route(struct ucma_file *file,
                                  const char __user *inbuf,
                                  int in_len, int out_len)
-@@ -1360,7 +1387,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
+@@ -1361,7 +1388,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
        [RDMA_USER_CM_CMD_LEAVE_MCAST]   = ucma_leave_multicast,
        [RDMA_USER_CM_CMD_MIGRATE_ID]    = ucma_migrate_id,
        [RDMA_USER_CM_CMD_QUERY]         = ucma_query,