pop

diff --git a/meta b/meta
index 6c29df167acafb7be16acd4a073c53a8c74ef984..75461282564507a4b9f4aad4ac8a32ac3cdfebe1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: a311cf3f6a59cf6768a0f017c0c725c7f74a8e5e
-Head: 307be975867c2451991b19c73e659d283bd76ac3
+Previous: fcdcd10df1480b64a8404627df30f96f5569d5d5
+Head: 45fe5aaa86f0e8699516378400fb30b785f1095d
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -25,8 +25,8 @@ Applied:
   export_get_sid: b8fa58386575a6177aa2f2ddaec90fb16ba4509d
   query_gid: f555e7ff6b0d5003ada002678316d1484703912e
   bind_ip: 307be975867c2451991b19c73e659d283bd76ac3
+  bind_addr: 45fe5aaa86f0e8699516378400fb30b785f1095d
 Unapplied:
-  bind_addr: d9106e4e04a0b56c5577a033ca5d210a5fc6c2a8
   resolve_addr: 3eea7538d40c92fda684529108aa810c454c58d0
   mcast_addr: c7e828defc737eaf6a99efde2ec1b73312c558e0
   set_num_paths: 4df9cc738c8d36efcf8403d0e7494b4e9360bf2f

diff --git a/patches/bind_addr b/patches/bind_addr
index 01903ce897274d66d5f689a884f524b8fd18e85d..58dece72009e225eb99fb7b318c27102edf14238 100644 (file)
--- a/patches/bind_addr
+++ b/patches/bind_addr
@@ -1,5 +1,5 @@
-Bottom: de5ab9675ff040f704a1bfddb18db20f86f1f111
-Top:    623118dd960570f0be259dc06b70cbb8e6e9611b
+Bottom: 896030a0ef632de38a2ead05735961b1e5ca234f
+Top:    fddfdd3fba730c530419ee0112e702ef0f66cdcf
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:42 -0700
 
@@ -16,10 +16,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 9a895fd..71edcd9 100644
+index 0701adc..dc8c53f 100644
 --- a/drivers/infiniband/core/ucma.c
 +++ b/drivers/infiniband/core/ucma.c
-@@ -536,6 +536,30 @@ static ssize_t ucma_bind_ip(struct ucma_file *file, const char __user *inbuf,
+@@ -537,6 +537,30 @@ static ssize_t ucma_bind_ip(struct ucma_file *file, const char __user *inbuf,
        return ret;
  }
  
@@ -50,7 +50,7 @@ index 9a895fd..71edcd9 100644
  static ssize_t ucma_resolve_ip(struct ucma_file *file,
                               const char __user *inbuf,
                               int in_len, int out_len)
-@@ -1335,7 +1359,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
+@@ -1336,7 +1360,8 @@ static ssize_t (*ucma_cmd_table[])(struct ucma_file *file,
        [RDMA_USER_CM_CMD_JOIN_IP_MCAST] = ucma_join_ip_multicast,
        [RDMA_USER_CM_CMD_LEAVE_MCAST]   = ucma_leave_multicast,
        [RDMA_USER_CM_CMD_MIGRATE_ID]    = ucma_migrate_id,