pop

diff --git a/meta b/meta
index 8a85c2efaf3da1a38794bf854eb7a73895886c8a..eafde0c54efe46cd478db03784f2f682f11fe58b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,11 @@
 Version: 1
-Previous: 2824e1a6d9c7ba2834c882c36dee8f6db2e83cb1
-Head: 766aea8efed96bf78c8929e080985acb70cce602
+Previous: a70bd258d441a7f27d706baa106f2a5360347809
+Head: 019f257dc026a7052e50bed3815f4fe86f631a3d
 Applied:
   af_ib: c3016259608d73bcdc527c1513bbc6e62f20b825
   use_port: 766aea8efed96bf78c8929e080985acb70cce602
+  cma_af_ib_checks: 019f257dc026a7052e50bed3815f4fe86f631a3d
 Unapplied:
-  cma_af_ib_checks: 89cb4dd2694d30d092c6b1423f93f529bb858b31
   ip_addr_size: 81676845f1805bee438ce9e7ddcf23996b52c67f
   cma_bind_port: c63b2aea28d9f5dbbee5213c60bfa0ea25d37794
   qp_type: a436162865fb3b2fab6837cff1bb018747cb34c8

diff --git a/patches/cma_af_ib_checks b/patches/cma_af_ib_checks
index f468416fd82151195b3bd38a3af3c07568c5ee44..ef7fc383a358d632e0ae0db3114c1e2c51f467c2 100644 (file)
--- a/patches/cma_af_ib_checks
+++ b/patches/cma_af_ib_checks
@@ -1,5 +1,5 @@
-Bottom: b25dd2e7489571e901d4eaa0bb9c165d6f4e1901
-Top:    889f3aa80f9d0981f60c462a6d20d35867f0565d
+Bottom: c2c2c5f4bdce7d1616c4e9b49b2f10dc0ddab28e
+Top:    01276437a0503b2abe76181fba355ceaf4f607f5
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-03-17 10:09:09 -0800
 
@@ -15,10 +15,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 9041a2b..6460fbf 100644
+index 2bed779..2159793 100644
 --- a/drivers/infiniband/core/cma.c
 +++ b/drivers/infiniband/core/cma.c
-@@ -46,6 +46,7 @@
+@@ -47,6 +47,7 @@
  
  #include <rdma/rdma_cm.h>
  #include <rdma/rdma_cm_ib.h>
@@ -26,7 +26,7 @@ index 9041a2b..6460fbf 100644
  #include <rdma/ib_cache.h>
  #include <rdma/ib_cm.h>
  #include <rdma/ib_sa.h>
-@@ -616,26 +617,30 @@ EXPORT_SYMBOL(rdma_init_qp_attr);
+@@ -617,26 +618,30 @@ EXPORT_SYMBOL(rdma_init_qp_attr);
  
  static inline int cma_zero_addr(struct sockaddr *addr)
  {