pop

diff --git a/meta b/meta
index ddf1820b1c3621ee5cebf1e9a125c838e9a6b770..f799b4f2cdeedac8ae239fc760b260e0829d676f 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,10 @@
 Version: 1
-Previous: 2ced62a960e9c40bbd255cf0be0bebec37f8b56e
-Head: 56e1a7cd4904fbfde59adbdfedd5374e5bde2e87
+Previous: 12e00515d107b4809c2e32b90c07474782f28706
+Head: 78ab6dcea90cc315ed43b84c466290adcf3e224d
 Applied:
+  af-ib-conn: 703ed114b9a72ec637838cbbb761cf380f849c13
+  addrtype: 78ab6dcea90cc315ed43b84c466290adcf3e224d
 Unapplied:
-  af-ib-conn: 08fc3e9eddae4f550c43a25eb8fdb73091aef28f
-  addrtype: 168846ffb332698287dbca5c970ab9cdf1a91830
   resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
   dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6

diff --git a/patches/addrtype b/patches/addrtype
index cd6d1cb7d6585120a4c40927d545bd7e8f789ed7..1418fa0d1e78cc2fa0f59de100494ab254d5016a 100644 (file)
--- a/patches/addrtype
+++ b/patches/addrtype
@@ -1,5 +1,5 @@
-Bottom: ac1a57ca92b5fde95dfda767f022d7afa3d2b0d9
-Top:    6206b16ab9819c58cb11a82b7933b79d677e361e
+Bottom: 563c0156b5aa397b724a216d142fa106778ccc7c
+Top:    5ae0232168a28eee35264a1b5c153e4896cf3484
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-29 15:02:54 -0700
 

diff --git a/patches/af-ib-conn b/patches/af-ib-conn
index e54e44c6a998402fdd5891631eef8ae65c115752..8f686108af165c12be6f117ed20d7c5893fe5eaa 100644 (file)
--- a/patches/af-ib-conn
+++ b/patches/af-ib-conn
@@ -1,5 +1,5 @@
-Bottom: 1d1da945e49647331f04f82a45cc353e9541a6ae
-Top:    ac1a57ca92b5fde95dfda767f022d7afa3d2b0d9
+Bottom: 87aac2094972e0392ac4742a2c54ba76c2f5747a
+Top:    563c0156b5aa397b724a216d142fa106778ccc7c
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-09-21 15:38:15 -0700
 
@@ -115,10 +115,10 @@ index ff9b426..85f32eb 100755
  
        if (src) {
 diff --git a/src/cma.h b/src/cma.h
-index 7135a61..04bea01 100644
+index bdd6a85..bd55ddc 100644
 --- a/src/cma.h
 +++ b/src/cma.h
-@@ -170,6 +170,18 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
+@@ -171,6 +171,18 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
  #define ucma_ib_resolve(x, y)
  #endif