pop

diff --git a/meta b/meta
index cd34c8d85e4b923d4eb231710f512d9e5544bf21..13f4a02cfef9e7d80dc36851c3ec90c03c425f90 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 9176d365ce1036af6428cee8f5ea2c6e5daa0b4c
-Head: 6701d720dba43232647afecc9cde3d92f7f6a392
+Previous: 9578e734c6d6a294c28496ea1bef96de47ecd875
+Head: c9708f48541e3b9816bfe2564e0700c47565fc84
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
@@ -13,8 +13,8 @@ Applied:
   ps_ib_qkey: 04459983f9437fd73087b70a8c4d176ff9da744b
   bind_af_ib: c11ce25641abe5d85be86940a60a16a271011a30
   cma_resolve_loopback: 6701d720dba43232647afecc9cde3d92f7f6a392
+  restrict_af_ib_loopback: c9708f48541e3b9816bfe2564e0700c47565fc84
 Unapplied:
-  restrict_af_ib_loopback: f0dbd8bdce1f1c2a8cd9ee9914f4acf64a9dc2d5
   resolve_af_ib: a4f98b1d866a69efe33bf55814065eead9376479
   get_sid: a114507d6ebcc15c5ddb649e0bde2015ce1699ea
   whitespace: a2121c980a8497edd9b55efbe8e7231c05739a3e

diff --git a/patches/restrict_af_ib_loopback b/patches/restrict_af_ib_loopback
index 08752c8daf3600b8862db86f580e2336511118f9..162653d327a81dd968d4b617ccdf8aaaa1b265d8 100644 (file)
--- a/patches/restrict_af_ib_loopback
+++ b/patches/restrict_af_ib_loopback
@@ -1,5 +1,5 @@
-Bottom: af9b4b64b98fc2c264cbc638ef8268921361733a
-Top:    26de2f615b19089b927fc0c913095f25631eccb8
+Bottom: 74f944208f19f5dd54c96f3966a5212f610cbf9a
+Top:    bcef50f2be6dfd8c85b7f8f52eb36f36e9c9a87f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-04-06 17:22:32 -0700
 
@@ -14,10 +14,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 304c69e..9d83eaa 100644
+index cb44786..b68fe4d 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -1802,26 +1802,40 @@ static void cma_set_loopback(struct sockaddr *addr)
+@@ -1804,26 +1804,40 @@ static void cma_set_loopback(struct sockaddr *addr)
  
  static int cma_bind_loopback(struct rdma_id_private *id_priv)
  {