From f969e75ff5fedac45195a05dd6c992cc709e0ec5 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:05:39 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/get_sid | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index 1de9ccab11c..1993de31c22 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: ef857885a6ffefd396f2351d2ee3054e854e9f98 -Head: 1e48a78e279147c6b49e067f70d831b92171b722 +Previous: d05bdffa85e8b770eaf25651f5a1b945ede781d6 +Head: a39f80e238bbf15eafc1846b862c67de2ad50e97 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -15,8 +15,8 @@ Applied: cma_resolve_loopback: 6701d720dba43232647afecc9cde3d92f7f6a392 restrict_af_ib_loopback: c9708f48541e3b9816bfe2564e0700c47565fc84 resolve_af_ib: 1e48a78e279147c6b49e067f70d831b92171b722 + get_sid: a39f80e238bbf15eafc1846b862c67de2ad50e97 Unapplied: - get_sid: a114507d6ebcc15c5ddb649e0bde2015ce1699ea whitespace: a2121c980a8497edd9b55efbe8e7231c05739a3e priv_data: 4e1cfb66dc12b3d0099e7ae66003f5d7a049fc84 listen_ib: d7a4519d30d517614f406fd589bd688c66e3ae1a diff --git a/patches/get_sid b/patches/get_sid index 1663e2c1d37..c3141d95cb8 100644 --- a/patches/get_sid +++ b/patches/get_sid @@ -1,5 +1,5 @@ -Bottom: 5e3aea4f1dc4e4830bffd44539b5d408a5eb15a3 -Top: 83c629e7e9618b1c502a02456bf97447d64ccc88 +Bottom: 548656a1bfdbce276eb4155a05f647939b8264bc +Top: b2448d24de8143b44e9ff8fef8a49c0a3f481f99 Author: Sean Hefty Date: 2010-04-06 17:22:33 -0700 @@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index bb128c1..643f8fe 100644 +index 922b92b..0b06b11 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c -@@ -1264,6 +1264,9 @@ out: +@@ -1265,6 +1265,9 @@ out: static __be64 cma_get_service_id(enum rdma_port_space ps, struct sockaddr *addr) { -- 2.46.0