pop

diff --git a/meta b/meta
index 48c8f2bb4f35e6e324ce4bc1a9524354eec63d88..811c0d99125edad38790e2486250754cfb945d77 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 8e4e9bbe0a04cd967206d64d11b435d2a63b087f
-Head: 704f54358a1f74229cd9e982b530ca8327c7658e
+Previous: 77486c6ede973e0a301898f5b153321aa5a516ae
+Head: c8173d50d1a8c2bbfb0c4459e05d3941175676b2
 Applied:
   librdmacm-1-8-add-foreign-opti: 715965b7231cd97d302e24c9e8ac89b2a57a57ab
   librdmacm-2-8-makefile-am-fix-: 9d2f1b068e6fcd62853fe013c7cc4316dcb3fc4b
@@ -10,6 +10,7 @@ Applied:
   librdmacm-6-8-add-gitignore-ru: d53cd79c3bde6186bda6822a04708b9d2666f8ae
   librdmacm-8-8-open-files-with-: 3eb1704b2e11413077933d6d3a963d81d508bdf8
   filemode: 704f54358a1f74229cd9e982b530ca8327c7658e
+  addrtype: c8173d50d1a8c2bbfb0c4459e05d3941175676b2
 Unapplied:
   ex-ib: d71ebf70cf74111cfd5f0982d9abe6ec68fb38e3
   use_acm: 282058197859038e66b5bc42cccc12f6fb9bbd93
@@ -19,7 +20,6 @@ Unapplied:
   old-clisvr: 0db572abcf3d78374a5ea0f91b709136948809cc
   old-hack-af-ib-loopback: e755d041f218772a8323936176c8f10e2024ae0f
   af-ib-conn: cf7b9e73d471477d4c7dff2592e5b0d3a7dea8ae
-  addrtype: 23a84fed89ba3f6b0eb63e5f8b37c0df504d0d3e
   old-resv-rs-len: 7b6ff5c4894f54b221d877adcd709795dffb2fe9
   old-rs-target-sgl: 7a07c80f2242e80c076dcf3ec6bb4c94626b284f
   old-rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/addrtype b/patches/addrtype
index 32500ef4897543d0f0d6b31f830bf0dc85709fe6..5e3db23018a512e4fb0b9ec825480598595c2f79 100644 (file)
--- a/patches/addrtype
+++ b/patches/addrtype
@@ -1,5 +1,5 @@
-Bottom: abf940a2b193bc88038fc0452b4a98b0edce1924
-Top:    afd1f170683674c99056258e1d735f9f4b55438a
+Bottom: d5960ce12fbbf29686c54212d2d4e6cc179ede2d
+Top:    0f2efee48a61eb345a7f7dd4ebbf0df79e739ea9
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-08-29 15:02:54 -0700
 
@@ -138,7 +138,7 @@ index 2b6b2b1..ab3e746 100644
        printf("test complete\n");
        destroy_nodes();
 diff --git a/examples/common.c b/examples/common.c
-index 939f50c..94057cb 100644
+index 4eb5bbe..0b6428c 100644
 --- a/examples/common.c
 +++ b/examples/common.c
 @@ -1,5 +1,5 @@