From cf03c715e06a17fc6af8abdb7143faaae5cd9831 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 28 Jun 2013 10:16:42 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/add-support-for-preloading-ipv | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index c250d4f..62cd954 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: 496297d3ea394cf895f97dfbbaea6188a9e0d857 -Head: 4561ebcdfee763675be6ac832befa738848c0fe7 +Previous: 3d4d2ba0592869b0c0bf301485ac059fa21dd061 +Head: cfdfad65eff1451c0381b7336ec8abf6e94d1900 Applied: rmcfg: 977896dc127018271adae25f7d637e098bad33d5 acm_notes-txt-change-dos-forma: b07f140dd83b881c922f4c6b70cfa7145727044f @@ -12,8 +12,8 @@ Applied: increase-buffer-space-for-inet: 50170099a86b117b6033021f812d4c73a7d9f472 ib_acme-c-support-ipv6-address: b67a388af31aae17da603dc123c255dfad647a95 convert-linux-header-files-fro: 4561ebcdfee763675be6ac832befa738848c0fe7 + add-support-for-preloading-ipv: cfdfad65eff1451c0381b7336ec8abf6e94d1900 Unapplied: - add-support-for-preloading-ipv: b53955120e1eec52a1b979a73f77e7c99c2f3487 add-option-to-allow-for-acm-ca: d70c340b1b7bb3d64d81768f4185b08415fbab55 notes-fmt: 988d784b42cdb9db05b1608a5cdb29c51215bd9e dev-name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/add-support-for-preloading-ipv b/patches/add-support-for-preloading-ipv index a0d04c9..6fe17bc 100644 --- a/patches/add-support-for-preloading-ipv +++ b/patches/add-support-for-preloading-ipv @@ -1,5 +1,5 @@ -Bottom: e1c84462b334facb3ab18f778540e29fdb917e65 -Top: 65aa5de852d5de93e2c43f3dcf50974282475ca4 +Bottom: 3316590918f6e1b8e54eac045f89bea98087510b +Top: ec5db008b112f21c867c8dc375025a4564a55607 Author: Hal Rosenstock Date: 2013-06-27 21:48:11 +0300 @@ -250,12 +250,12 @@ index a37ebaa..ae326e5 100644 static FILE *acm_open_log(void) diff --git a/src/acme.c b/src/acme.c -index 0f1c53a..adb4fa2 100644 +index a0dcf8d..7f93b68 100644 --- a/src/acme.c +++ b/src/acme.c @@ -260,6 +260,22 @@ static void gen_opts_temp(FILE *f) fprintf(f, "# Default is ACM_CONF_DIR/ibacm_route.data\n"); - fprintf(f, "# /etc/rdma/ibacm_route.data\n"); + fprintf(f, "# route_data_file /etc/rdma/ibacm_route.data\n"); fprintf(f, "\n"); + fprintf(f, "# addr_preload:\n"); + fprintf(f, "# Specifies if the ACM address cache should be preloaded, or built on demand.\n"); -- 2.46.0