pop

diff --git a/meta b/meta
index 13f4a02cfef9e7d80dc36851c3ec90c03c425f90..1de9ccab11c01a68ee1fa7551919da41c37a9c05 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9578e734c6d6a294c28496ea1bef96de47ecd875
-Head: c9708f48541e3b9816bfe2564e0700c47565fc84
+Previous: ef857885a6ffefd396f2351d2ee3054e854e9f98
+Head: 1e48a78e279147c6b49e067f70d831b92171b722
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -14,8 +14,8 @@ Applied:
   bind_af_ib: c11ce25641abe5d85be86940a60a16a271011a30
   cma_resolve_loopback: 6701d720dba43232647afecc9cde3d92f7f6a392
   restrict_af_ib_loopback: c9708f48541e3b9816bfe2564e0700c47565fc84
+  resolve_af_ib: 1e48a78e279147c6b49e067f70d831b92171b722
 Unapplied:
-  resolve_af_ib: a4f98b1d866a69efe33bf55814065eead9376479
   get_sid: a114507d6ebcc15c5ddb649e0bde2015ce1699ea
   whitespace: a2121c980a8497edd9b55efbe8e7231c05739a3e
   priv_data: 4e1cfb66dc12b3d0099e7ae66003f5d7a049fc84

diff --git a/patches/resolve_af_ib b/patches/resolve_af_ib
index 8f73292b28c52e8296d947bb5d814e9342c2bcee..d9fb4c2186a8fae2070412d691cff906bc7f4d0e 100644 (file)
--- a/patches/resolve_af_ib
+++ b/patches/resolve_af_ib
@@ -1,5 +1,5 @@
-Bottom: 26de2f615b19089b927fc0c913095f25631eccb8
-Top:    5e3aea4f1dc4e4830bffd44539b5d408a5eb15a3
+Bottom: bcef50f2be6dfd8c85b7f8f52eb36f36e9c9a87f
+Top:    548656a1bfdbce276eb4155a05f647939b8264bc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:33 -0700
 
@@ -16,10 +16,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
-index 9d83eaa..bb128c1 100644
+index b68fe4d..922b92b 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -354,6 +354,61 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv)
+@@ -355,6 +355,61 @@ static int cma_acquire_dev(struct rdma_id_private *id_priv)
        return ret;
  }
  
@@ -81,7 +81,7 @@ index 9d83eaa..bb128c1 100644
  static void cma_deref_id(struct rdma_id_private *id_priv)
  {
        if (atomic_dec_and_test(&id_priv->refcount))
-@@ -1937,14 +1992,48 @@ err:
+@@ -1939,14 +1994,48 @@ err:
        return ret;
  }
  
@@ -131,7 +131,7 @@ index 9d83eaa..bb128c1 100644
                }
        }
        return rdma_bind_addr(id, src_addr);
-@@ -1968,12 +2057,18 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
+@@ -1970,12 +2059,18 @@ int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
  
        atomic_inc(&id_priv->refcount);
        memcpy(&id->route.addr.dst_addr, dst_addr, rdma_addr_size(dst_addr));