From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D0FE91B4AA for ; Thu, 29 Nov 2018 14:24:37 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 41E7C3138BA4; Thu, 29 Nov 2018 13:24:37 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id C378F106224E; Thu, 29 Nov 2018 13:24:35 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Allain Legacy , dpdk stable Date: Thu, 29 Nov 2018 13:21:26 +0000 Message-Id: <20181129132128.7609-86-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 29 Nov 2018 13:24:37 +0000 (UTC) Subject: [dpdk-stable] patch 'fix indentation in symbol maps' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Nov 2018 13:24:38 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/08/18. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 9fbfdbfb586758a5d652308228a15e2a201c5d92 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 26 Nov 2018 18:03:25 +0100 Subject: [PATCH] fix indentation in symbol maps [ upstream commit c5f21bdae4650bc168638c7b4a2c789e245ba562 ] Signed-off-by: Thomas Monjalon Acked-by: Allain Legacy --- drivers/net/avp/rte_pmd_avp_version.map | 3 +-- drivers/net/axgbe/rte_pmd_axgbe_version.map | 3 +-- drivers/net/bonding/rte_pmd_bond_version.map | 9 ++++----- lib/librte_cfgfile/rte_cfgfile_version.map | 4 ++-- lib/librte_compressdev/rte_compressdev_version.map | 4 ++-- lib/librte_cryptodev/rte_cryptodev_version.map | 2 +- lib/librte_ip_frag/rte_ip_frag_version.map | 4 ++-- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map index af8f3f479..5352e7e3b 100644 --- a/drivers/net/avp/rte_pmd_avp_version.map +++ b/drivers/net/avp/rte_pmd_avp_version.map @@ -1,4 +1,3 @@ DPDK_17.05 { - - local: *; + local: *; }; diff --git a/drivers/net/axgbe/rte_pmd_axgbe_version.map b/drivers/net/axgbe/rte_pmd_axgbe_version.map index b26efa67c..de8e412ff 100644 --- a/drivers/net/axgbe/rte_pmd_axgbe_version.map +++ b/drivers/net/axgbe/rte_pmd_axgbe_version.map @@ -1,4 +1,3 @@ DPDK_18.05 { - - local: *; + local: *; }; diff --git a/drivers/net/bonding/rte_pmd_bond_version.map b/drivers/net/bonding/rte_pmd_bond_version.map index 03ddb44e7..00d955c48 100644 --- a/drivers/net/bonding/rte_pmd_bond_version.map +++ b/drivers/net/bonding/rte_pmd_bond_version.map @@ -47,9 +47,8 @@ DPDK_17.08 { rte_eth_bond_8023ad_dedicated_queues_enable; rte_eth_bond_8023ad_dedicated_queues_disable; - rte_eth_bond_8023ad_agg_selection_get; - rte_eth_bond_8023ad_agg_selection_set; - rte_eth_bond_8023ad_conf_get; - rte_eth_bond_8023ad_setup; - + rte_eth_bond_8023ad_agg_selection_get; + rte_eth_bond_8023ad_agg_selection_set; + rte_eth_bond_8023ad_conf_get; + rte_eth_bond_8023ad_setup; } DPDK_16.07; diff --git a/lib/librte_cfgfile/rte_cfgfile_version.map b/lib/librte_cfgfile/rte_cfgfile_version.map index cc4a11f65..a0a11cea8 100644 --- a/lib/librte_cfgfile/rte_cfgfile_version.map +++ b/lib/librte_cfgfile/rte_cfgfile_version.map @@ -23,7 +23,7 @@ DPDK_16.04 { DPDK_17.05 { - global: + global: - rte_cfgfile_load_with_params; + rte_cfgfile_load_with_params; } DPDK_16.04; diff --git a/lib/librte_compressdev/rte_compressdev_version.map b/lib/librte_compressdev/rte_compressdev_version.map index 6f900b673..9e2d35285 100644 --- a/lib/librte_compressdev/rte_compressdev_version.map +++ b/lib/librte_compressdev/rte_compressdev_version.map @@ -1,4 +1,4 @@ EXPERIMENTAL { - global: + global: rte_compressdev_capability_get; @@ -36,4 +36,4 @@ EXPERIMENTAL { rte_comp_op_pool_create; - local: *; + local: *; }; diff --git a/lib/librte_cryptodev/rte_cryptodev_version.map b/lib/librte_cryptodev/rte_cryptodev_version.map index 7ca007353..a695b61dc 100644 --- a/lib/librte_cryptodev/rte_cryptodev_version.map +++ b/lib/librte_cryptodev/rte_cryptodev_version.map @@ -90,5 +90,5 @@ DPDK_18.05 { EXPERIMENTAL { - global: + global: rte_cryptodev_asym_capability_get; diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map index d1acf07cb..5f67b2cb3 100644 --- a/lib/librte_ip_frag/rte_ip_frag_version.map +++ b/lib/librte_ip_frag/rte_ip_frag_version.map @@ -14,7 +14,7 @@ DPDK_2.0 { DPDK_17.08 { - global: + global: - rte_ip_frag_table_destroy; + rte_ip_frag_table_destroy; } DPDK_2.0; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:37.156015053 +0000 +++ 0085-fix-indentation-in-symbol-maps.patch 2018-11-29 13:11:35.000000000 +0000 @@ -1,20 +1,21 @@ -From c5f21bdae4650bc168638c7b4a2c789e245ba562 Mon Sep 17 00:00:00 2001 +From 9fbfdbfb586758a5d652308228a15e2a201c5d92 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Mon, 26 Nov 2018 18:03:25 +0100 Subject: [PATCH] fix indentation in symbol maps +[ upstream commit c5f21bdae4650bc168638c7b4a2c789e245ba562 ] + Signed-off-by: Thomas Monjalon Acked-by: Allain Legacy --- - drivers/net/avp/rte_pmd_avp_version.map | 3 +-- - drivers/net/axgbe/rte_pmd_axgbe_version.map | 3 +-- - drivers/net/bonding/rte_pmd_bond_version.map | 9 ++++----- - lib/librte_cfgfile/rte_cfgfile_version.map | 4 ++-- - .../rte_compressdev_version.map | 4 ++-- - lib/librte_cryptodev/rte_cryptodev_version.map | 2 +- - lib/librte_ip_frag/rte_ip_frag_version.map | 4 ++-- - lib/librte_power/rte_power_version.map | 17 ++++++++--------- - 8 files changed, 21 insertions(+), 25 deletions(-) + drivers/net/avp/rte_pmd_avp_version.map | 3 +-- + drivers/net/axgbe/rte_pmd_axgbe_version.map | 3 +-- + drivers/net/bonding/rte_pmd_bond_version.map | 9 ++++----- + lib/librte_cfgfile/rte_cfgfile_version.map | 4 ++-- + lib/librte_compressdev/rte_compressdev_version.map | 4 ++-- + lib/librte_cryptodev/rte_cryptodev_version.map | 2 +- + lib/librte_ip_frag/rte_ip_frag_version.map | 4 ++-- + 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/net/avp/rte_pmd_avp_version.map b/drivers/net/avp/rte_pmd_avp_version.map index af8f3f479..5352e7e3b 100644 @@ -96,7 +97,7 @@ rte_cryptodev_asym_capability_get; diff --git a/lib/librte_ip_frag/rte_ip_frag_version.map b/lib/librte_ip_frag/rte_ip_frag_version.map -index d40d5515f..a193007c6 100644 +index d1acf07cb..5f67b2cb3 100644 --- a/lib/librte_ip_frag/rte_ip_frag_version.map +++ b/lib/librte_ip_frag/rte_ip_frag_version.map @@ -14,7 +14,7 @@ DPDK_2.0 { @@ -109,32 +110,6 @@ + rte_ip_frag_table_destroy; } DPDK_2.0; -diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map -index 17a083b2b..042917360 100644 ---- a/lib/librte_power/rte_power_version.map -+++ b/lib/librte_power/rte_power_version.map -@@ -36,13 +36,12 @@ DPDK_18.08 { - - EXPERIMENTAL { -- global: -- -- rte_empty_poll_detection; -- rte_power_empty_poll_stat_fetch; -- rte_power_empty_poll_stat_free; -- rte_power_empty_poll_stat_init; -- rte_power_empty_poll_stat_update; -- rte_power_poll_stat_fetch; -- rte_power_poll_stat_update; -+ global: - -+ rte_empty_poll_detection; -+ rte_power_empty_poll_stat_fetch; -+ rte_power_empty_poll_stat_free; -+ rte_power_empty_poll_stat_init; -+ rte_power_empty_poll_stat_update; -+ rte_power_poll_stat_fetch; -+ rte_power_poll_stat_update; - }; -- 2.19.0