From 63c37babd64b83531409cccd31019762326923cc Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:05:28 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/bind_af_ib | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta b/meta index 6e9fa6bbabb..62d5a6edfb1 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: cb2ce7d3948aed81e9b28e32ddeeb6033491f874 -Head: 04459983f9437fd73087b70a8c4d176ff9da744b +Previous: ce1524b9735c0c1f40179d0ff6c53967b2479e6f +Head: c11ce25641abe5d85be86940a60a16a271011a30 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -11,8 +11,8 @@ Applied: ucma_create_ps_ib: ad1ac06f554fd9be3f948747dbd57ffdc34765e6 ucma_event_ps_ib: 38210187a47c8ff74392afdc5a792442309ebfe8 ps_ib_qkey: 04459983f9437fd73087b70a8c4d176ff9da744b + bind_af_ib: c11ce25641abe5d85be86940a60a16a271011a30 Unapplied: - bind_af_ib: a549d32972eb325e3fd02d5b12039e9c5f9c8c89 cma_resolve_loopback: 9c437af437c875958211936bc66e8f2fe022a6dd restrict_af_ib_loopback: f0dbd8bdce1f1c2a8cd9ee9914f4acf64a9dc2d5 resolve_af_ib: a4f98b1d866a69efe33bf55814065eead9376479 diff --git a/patches/bind_af_ib b/patches/bind_af_ib index 26507f15e19..e46b01ac1fe 100644 --- a/patches/bind_af_ib +++ b/patches/bind_af_ib @@ -1,5 +1,5 @@ -Bottom: fabe602ba12ef9a9d7da50afceb6e287f9313474 -Top: d4a4ba8a84b896ce900f33c36b30c9a629f0de3f +Bottom: a8c150d03dcbac61f2df335b55a6c0a0bb15522b +Top: 818636441aec1cbd6a2d0853d465375b1108aa3f Author: Sean Hefty Date: 2010-04-06 17:22:30 -0700 @@ -18,10 +18,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index f8ca424..2645407 100644 +index fba593f..73f1b4a 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c -@@ -328,6 +328,13 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey) +@@ -329,6 +329,13 @@ static int cma_set_qkey(struct rdma_id_private *id_priv, u32 qkey) return ret; } @@ -35,7 +35,7 @@ index f8ca424..2645407 100644 static int cma_acquire_dev(struct rdma_id_private *id_priv) { struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr; -@@ -2185,7 +2192,9 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) +@@ -2187,7 +2194,9 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) struct rdma_id_private *id_priv; int ret; @@ -46,7 +46,7 @@ index f8ca424..2645407 100644 return -EAFNOSUPPORT; id_priv = container_of(id, struct rdma_id_private, id); -@@ -2197,9 +2206,14 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) +@@ -2199,9 +2208,14 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) goto err1; if (!cma_any_addr(addr)) { -- 2.46.0