From 4a8dd8d1e840f0ca19627f1da402a8565f8517f8 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:05:51 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/query_path | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta b/meta index 4bc6060ed3d..e9a37e7363a 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 5e29f448aa5d12580732237a94c731370f53b8b5 -Head: 5a07bc6703662569203b9f6e8e8e7dc8c93fab0f +Previous: f981f639cbb0e578aedd17b12c8d81016897f77c +Head: 64fee0baa6daa407dbb57a694f5a7069bdcfcaa9 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -21,8 +21,8 @@ Applied: listen_ib: 6c8e4613a7e27150ff387a1ad0781c4f7a8b541e query_addr: 1b0870c87cad88b83b29df0583e57827faa474c2 sa_pack_path: 5a07bc6703662569203b9f6e8e8e7dc8c93fab0f + query_path: 64fee0baa6daa407dbb57a694f5a7069bdcfcaa9 Unapplied: - query_path: 1830722bb5e84451e3b458719cea8c746a2fb6d4 export_get_sid: b0e001e44dda5f9cc357ff506b04ee13d5c88270 query_gid: b87cccdb27a7e75c0f9e03a9d37593ceab4d4ede bind_ip: dea11b78996ae6346c060853cc8072134c2d8efb diff --git a/patches/query_path b/patches/query_path index df720fabf81..d6415cac095 100644 --- a/patches/query_path +++ b/patches/query_path @@ -1,5 +1,5 @@ -Bottom: ac0a7b7b10eec00d8b76afb7d32e27592b58ccf4 -Top: 90660911fee20c253edd7540246ff2d3128551cb +Bottom: e7f6df9cd44c96b48a40a1a828115a0402cb9d01 +Top: 7b192f755356e070163b4774f7a07ef35c5e7a44 Author: Sean Hefty Date: 2010-04-06 17:22:38 -0700 @@ -29,10 +29,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c -index 685e7fa..0511ee6 100644 +index 22ae29a..d55f1a9 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c -@@ -696,6 +696,38 @@ static ssize_t ucma_query_addr(struct ucma_context *ctx, +@@ -697,6 +697,38 @@ static ssize_t ucma_query_addr(struct ucma_context *ctx, return ret; } @@ -71,7 +71,7 @@ index 685e7fa..0511ee6 100644 static ssize_t ucma_query(struct ucma_file *file, const char __user *inbuf, int in_len, int out_len) -@@ -717,6 +749,9 @@ static ssize_t ucma_query(struct ucma_file *file, +@@ -718,6 +750,9 @@ static ssize_t ucma_query(struct ucma_file *file, case RDMA_USER_CM_QUERY_ADDR: ret = ucma_query_addr(ctx, response, out_len); break; -- 2.46.0