From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B296DA0518 for ; Fri, 24 Jul 2020 14:03:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AB2131BFE3; Fri, 24 Jul 2020 14:03:19 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 53CD71BFE5 for ; Fri, 24 Jul 2020 14:03:18 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id f18so8098580wrs.0 for ; Fri, 24 Jul 2020 05:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FKRM0WJx0+PyBqPLXfQPk8SOBcsDCBcPrXCSy1GqA3k=; b=SZU/zlQOjqVX0ZluyQFGUIi+JjR08C4l+h8qVZZHYhRDsh1lOcEutDXf5RafrUkc+8 yVtzmFXO2LdNoIFMl6nPRJbCkJwJn+Wa93KH77o4zHlLOAxCDAC+MgHhPefRzNa3p0E3 Tyd4ByLFVJ8VO5bslmEWvQvhWGezgy5U4Csw4SfhKLxUnQfA89P2gNfbBXF2fppFRoab QxJcppjmuT0LpYz/fJ95QqrV3cYHGn0mkiV6WQ9G2gcLLO9Vca4W635wE7dPmw1QWc2p T1XGJg3uoHOJa7iRpT+YHWfP7lE+sZjKC191GbV8zBfWNt5FfYkHYzn9rq+0jS/TTgcy yWFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FKRM0WJx0+PyBqPLXfQPk8SOBcsDCBcPrXCSy1GqA3k=; b=GZ8g2ahrE74Tznh3SkAmBhfRPBLMtIRS0CzCbsSnRR4j8Zwg1SqsreZekU1XINa9Ij tkN8zEJ+nLW4Q93pJnLN03VzvrY/cpxqFwiwF024dSXO9zCMelULPdwPcAdqwsvbJa0k oRO1TpZ8lG7Wlam3Uf+PT6R3yivL1hSfatPQh1sE03QXdPP/fM8hoLoNQ2exhQFijknF /8z7fSTE246jtuv3znUjs7RquCIcxSMO3njVo95MYVd04tVmWtZJQlnpcwMBsEpqlqg7 eIrzbpOi+95I22/yw8rgtUR0u/ieksYjJo7pR59WVz403YVkNUy503s1FEsDqAdXc4Eu 5GZQ== X-Gm-Message-State: AOAM530DAOLm7r1s542VS789Vr3/zArPwaJlB3mEk/DN2gNS0IyWALyE Zn2VXrnkI1aCMlhlIC9o9u4= X-Google-Smtp-Source: ABdhPJyvar+7W5FOvEoToB5g2nTZOVJ0AFXFuqKFcbpivMOBJv0XFOI4hyQO1VbucYZ2lXm9NHC8Vw== X-Received: by 2002:a5d:6992:: with SMTP id g18mr8176179wru.15.1595592197993; Fri, 24 Jul 2020 05:03:17 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y2sm2541591wmg.25.2020.07.24.05.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:03:16 -0700 (PDT) From: luca.boccassi@gmail.com To: Fady Bader Cc: dpdk stable Date: Fri, 24 Jul 2020 12:57:59 +0100 Message-Id: <20200724120030.1863487-41-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'meter: remove inline functions from export list' has been queued to stable release 19.11.4 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. 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. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 451a93ce727a0adf151f8b4e808b4f16c55933bb Mon Sep 17 00:00:00 2001 From: Fady Bader Date: Wed, 17 Jun 2020 11:24:31 +0300 Subject: [PATCH] meter: remove inline functions from export list [ upstream commit f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b ] The code didn't compile when using exported meter functions under Windows. error LNK2001: unresolved external symbol rte_meter_srtcm_color_aware_check error LNK2001: unresolved external symbol rte_meter_srtcm_color_blind_check error LNK2001: unresolved external symbol rte_meter_trtcm_color_aware_check error LNK2001: unresolved external symbol rte_meter_trtcm_color_blind_check error LNK2001: unresolved external symbol rte_meter_trtcm_rfc4115_color_aware_check error LNK2001: unresolved external symbol rte_meter_trtcm_rfc4115_color_blind_check The cause was that there were some inline functions that were included in the export list. To solve this the functions were removed from rte_meter_version.map export list which are implemented in the header and shouldn't be exported. Fixes: 655796d2b5fb ("meter: support RFC4115 trTCM") Fixes: 9d41beed24b0 ("lib: provide initial versioning") Signed-off-by: Fady Bader --- lib/librte_meter/rte_meter_version.map | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map index 46410b036..3fc7ddd19 100644 --- a/lib/librte_meter/rte_meter_version.map +++ b/lib/librte_meter/rte_meter_version.map @@ -1,12 +1,8 @@ DPDK_20.0 { global: - rte_meter_srtcm_color_aware_check; - rte_meter_srtcm_color_blind_check; rte_meter_srtcm_config; rte_meter_srtcm_profile_config; - rte_meter_trtcm_color_aware_check; - rte_meter_trtcm_color_blind_check; rte_meter_trtcm_config; rte_meter_trtcm_profile_config; @@ -16,8 +12,6 @@ DPDK_20.0 { EXPERIMENTAL { global: - rte_meter_trtcm_rfc4115_color_aware_check; - rte_meter_trtcm_rfc4115_color_blind_check; rte_meter_trtcm_rfc4115_config; rte_meter_trtcm_rfc4115_profile_config; }; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:50.199270985 +0100 +++ 0041-meter-remove-inline-functions-from-export-list.patch 2020-07-24 12:53:48.255005863 +0100 @@ -1,8 +1,10 @@ -From f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b Mon Sep 17 00:00:00 2001 +From 451a93ce727a0adf151f8b4e808b4f16c55933bb Mon Sep 17 00:00:00 2001 From: Fady Bader Date: Wed, 17 Jun 2020 11:24:31 +0300 Subject: [PATCH] meter: remove inline functions from export list +[ upstream commit f6da77d92ddc76bb5bd0ea9bf4ff044c9fde1a9b ] + The code didn't compile when using exported meter functions under Windows. error LNK2001: unresolved external symbol @@ -25,7 +27,6 @@ Fixes: 655796d2b5fb ("meter: support RFC4115 trTCM") Fixes: 9d41beed24b0 ("lib: provide initial versioning") -Cc: stable@dpdk.org Signed-off-by: Fady Bader --- @@ -33,7 +34,7 @@ 1 file changed, 6 deletions(-) diff --git a/lib/librte_meter/rte_meter_version.map b/lib/librte_meter/rte_meter_version.map -index b493bcebe..58859d4d7 100644 +index 46410b036..3fc7ddd19 100644 --- a/lib/librte_meter/rte_meter_version.map +++ b/lib/librte_meter/rte_meter_version.map @@ -1,12 +1,8 @@ @@ -50,14 +51,14 @@ rte_meter_trtcm_profile_config; @@ -16,8 +12,6 @@ DPDK_20.0 { - DPDK_21 { + EXPERIMENTAL { global: - rte_meter_trtcm_rfc4115_color_aware_check; - rte_meter_trtcm_rfc4115_color_blind_check; rte_meter_trtcm_rfc4115_config; rte_meter_trtcm_rfc4115_profile_config; - + }; -- 2.20.1