pop

diff --git a/meta b/meta
index 62d5a6edfb1a3228362285d311d5531e4481545a..cd34c8d85e4b923d4eb231710f512d9e5544bf21 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: ce1524b9735c0c1f40179d0ff6c53967b2479e6f
-Head: c11ce25641abe5d85be86940a60a16a271011a30
+Previous: 9176d365ce1036af6428cee8f5ea2c6e5daa0b4c
+Head: 6701d720dba43232647afecc9cde3d92f7f6a392
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -12,8 +12,8 @@ Applied:
   ucma_event_ps_ib: 38210187a47c8ff74392afdc5a792442309ebfe8
   ps_ib_qkey: 04459983f9437fd73087b70a8c4d176ff9da744b
   bind_af_ib: c11ce25641abe5d85be86940a60a16a271011a30
+  cma_resolve_loopback: 6701d720dba43232647afecc9cde3d92f7f6a392
 Unapplied:
-  cma_resolve_loopback: 9c437af437c875958211936bc66e8f2fe022a6dd
   restrict_af_ib_loopback: f0dbd8bdce1f1c2a8cd9ee9914f4acf64a9dc2d5
   resolve_af_ib: a4f98b1d866a69efe33bf55814065eead9376479
   get_sid: a114507d6ebcc15c5ddb649e0bde2015ce1699ea

diff --git a/patches/cma_resolve_loopback b/patches/cma_resolve_loopback
index d69c0f21aa83056f8f50ac6d1622a3af00b25c68..047538e768aac45c33d91c63c62c5df6292e96d4 100644 (file)
--- a/patches/cma_resolve_loopback
+++ b/patches/cma_resolve_loopback
@@ -1,5 +1,5 @@
-Bottom: d4a4ba8a84b896ce900f33c36b30c9a629f0de3f
-Top:    af9b4b64b98fc2c264cbc638ef8268921361733a
+Bottom: 818636441aec1cbd6a2d0853d465375b1108aa3f
+Top:    74f944208f19f5dd54c96f3966a5212f610cbf9a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:31 -0700
 
@@ -24,10 +24,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 2645407..304c69e 100644
+index 73f1b4a..cb44786 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -1783,6 +1783,23 @@ err:
+@@ -1785,6 +1785,23 @@ err:
  }
  EXPORT_SYMBOL(rdma_resolve_route);
  
@@ -51,7 +51,7 @@ index 2645407..304c69e 100644
  static int cma_bind_loopback(struct rdma_id_private *id_priv)
  {
        struct cma_device *cma_dev;
-@@ -1823,6 +1840,7 @@ port_found:
+@@ -1825,6 +1842,7 @@ port_found:
        ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey);
        id_priv->id.port_num = p;
        cma_attach_to_dev(id_priv, cma_dev);
@@ -59,7 +59,7 @@ index 2645407..304c69e 100644
  out:
        mutex_unlock(&lock);
        return ret;
-@@ -1877,7 +1895,6 @@ out:
+@@ -1879,7 +1897,6 @@ out:
  static int cma_resolve_loopback(struct rdma_id_private *id_priv)
  {
        struct cma_work *work;
@@ -67,7 +67,7 @@ index 2645407..304c69e 100644
        union ib_gid gid;
        int ret;
  
-@@ -1894,18 +1911,6 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
+@@ -1896,18 +1913,6 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv)
        rdma_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid);
        rdma_addr_set_dgid(&id_priv->id.route.addr.dev_addr, &gid);