From f84e8c990a1bb4e4b167d59561d9125456843171 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 21 Sep 2012 17:17:47 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/af-ib-conn | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index e482639d..d8d28ed4 100644 --- a/meta +++ b/meta @@ -1,10 +1,10 @@ Version: 1 -Previous: 327752e2fbf2852763fe56bc91a409fa77cc9846 -Head: 3c70a581f12975b49cd1aac0236f09c6b8fb9950 +Previous: 88f8aaef8d5d571b2a6f01a7136dd24e1503bd43 +Head: 5ce5f56950e0ed453c1798aedfa717bd18a2a754 Applied: cont_of: 3c70a581f12975b49cd1aac0236f09c6b8fb9950 + af-ib-conn: 5ce5f56950e0ed453c1798aedfa717bd18a2a754 Unapplied: - af-ib-conn: 027cb3c0a4fe70b9a9a65896b5f2e53683328db8 addrtype: 066c2615bf5399848088a9771093a76c5e205bf1 dbg-fork: 5679a32af8305db3c0406f9abb961259304a384a dbg-out: 4b4c0572eab77856d8fbb919b1feb8f3502a101a diff --git a/patches/af-ib-conn b/patches/af-ib-conn index c10d66c8..d83543c6 100644 --- a/patches/af-ib-conn +++ b/patches/af-ib-conn @@ -1,5 +1,5 @@ -Bottom: fd25e5104198197967ac10d49db6570c49bf661c -Top: 70740cf339f3221216acd355b9e423de6dd18b8b +Bottom: 2d834bd45b50141247cec98ef6807b7374d7cf2e +Top: acebc93d3ba52dd26ac077d8c4d5f4e3ea5d08b8 Author: Sean Hefty Date: 2012-09-21 15:38:15 -0700 @@ -98,10 +98,10 @@ index 3d8c912..4b17043 100755 ib_rai->ai_connect = hdr; diff --git a/src/cma.c b/src/cma.c -index d168df6..bd18993 100755 +index 91bf108..1888c99 100755 --- a/src/cma.c +++ b/src/cma.c -@@ -1288,6 +1288,12 @@ static void ucma_copy_conn_param_to_kern(struct cma_id_private *id_priv, +@@ -1290,6 +1290,12 @@ static void ucma_copy_conn_param_to_kern(struct cma_id_private *id_priv, if (id_priv->connect_len) { memcpy(dst->private_data, id_priv->connect, id_priv->connect_len); dst->private_data_len = id_priv->connect_len; -- 2.46.0