From 3abe0d2750073b2945acfe20af7db5f939fa1780 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 12 May 2010 18:05:41 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/whitespace | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index 1993de31c22..e10c0dab7af 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: d05bdffa85e8b770eaf25651f5a1b945ede781d6 -Head: a39f80e238bbf15eafc1846b862c67de2ad50e97 +Previous: 2d30c5c9e7a55328413d50e842588944be926fb4 +Head: faeb36860e2dcc00ba9bd6d012f16b2ac91900d7 Applied: af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825 use_port: 766aea8efed96bf78c8929e080985acb70cce602 @@ -16,8 +16,8 @@ Applied: restrict_af_ib_loopback: c9708f48541e3b9816bfe2564e0700c47565fc84 resolve_af_ib: 1e48a78e279147c6b49e067f70d831b92171b722 get_sid: a39f80e238bbf15eafc1846b862c67de2ad50e97 + whitespace: faeb36860e2dcc00ba9bd6d012f16b2ac91900d7 Unapplied: - whitespace: a2121c980a8497edd9b55efbe8e7231c05739a3e priv_data: 4e1cfb66dc12b3d0099e7ae66003f5d7a049fc84 listen_ib: d7a4519d30d517614f406fd589bd688c66e3ae1a query_addr: 0257cc9298aa70c4bfc1a8c393f970375a897825 diff --git a/patches/whitespace b/patches/whitespace index 44ff53da15a..7517a4028b9 100644 --- a/patches/whitespace +++ b/patches/whitespace @@ -1,5 +1,5 @@ -Bottom: 83c629e7e9618b1c502a02456bf97447d64ccc88 -Top: e1f1268d0c046919cad2e8914e1a5932d794a868 +Bottom: b2448d24de8143b44e9ff8fef8a49c0a3f481f99 +Top: 7e1b4654249758f35bfd766796eb48453d393b5b Author: Sean Hefty Date: 2010-04-06 17:22:34 -0700 @@ -13,10 +13,10 @@ Signed-off-by: Sean Hefty --- diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c -index 643f8fe..3212604 100644 +index 0b06b11..cabcd5e 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c -@@ -1663,7 +1663,7 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, +@@ -1664,7 +1664,7 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, path_rec.numb_path = 1; path_rec.reversible = 1; path_rec.service_id = cma_get_service_id(id_priv->id.ps, -- 2.46.0